diff --git a/.github/scripts/valid_json.py b/.github/scripts/valid_json.py
index b65a658..bcfb48d 100644
--- a/.github/scripts/valid_json.py
+++ b/.github/scripts/valid_json.py
@@ -12,19 +12,33 @@ def check_json_validity(file_path):
         print(f"Found {len(data)} airport entries")
 
         for key, value in data.items():
-            if "lat" in value:
+            if "icao" not in value:
+                errors.append(f'Missing "icao" field in entry "{key}".')
+            else:
+                if value["icao"] != key:
+                    errors.append(f'Key "{key}" does not match its "icao" field value "{value["icao"]}".')
+                if len(value["icao"]) != 4:
+                    errors.append(f'Invalid "icao" length in entry "{key}". Expected 4, got {len(value["icao"])}.')
+
+            if "lat" not in value:
+                errors.append(f'Missing "lat" field in entry "{key}".')
+            else:
                 if not isinstance(value["lat"], (float, int)):
                     errors.append(f'Invalid type for "lat" in entry "{key}". Expected float or int, got {type(value["lat"]).__name__}.')
-                elif not -90 <= value["lat"] <= 90:
+                if not -90 <= value["lat"] <= 90:
                     errors.append(f'Invalid value for "lat" in entry "{key}". Expected between -90 and 90, got {value["lat"]}.')
 
-            if "lon" in value:
+            if "lon" not in value:
+                errors.append(f'Missing "lon" field in entry "{key}".')
+            else:
                 if not isinstance(value["lon"], (float, int)):
                     errors.append(f'Invalid type for "lon" in entry "{key}". Expected float or int, got {type(value["lon"]).__name__}.')
-                elif not -180 <= value["lon"] <= 180:
+                if not -180 <= value["lon"] <= 180:
                     errors.append(f'Invalid value for "lon" in entry "{key}". Expected between -180 and 180, got {value["lon"]}.')
 
-            if "elevation" in value:
+            if "elevation" not in value:
+                errors.append(f'Missing "elevation" field in entry "{key}".')
+            else:
                 if not isinstance(value["elevation"], int):
                     errors.append(f'Invalid type for "elevation" in entry "{key}". Expected int, got {type(value["elevation"]).__name__}.')
 
@@ -45,7 +59,7 @@ def main():
     errors = check_json_validity(args.file)
     
     if errors:
-        print("Validation errors found:")
+        print(f'{len(errors)} validation errors found:')
         for error in errors:
             print(error)
         sys.exit(1)
diff --git a/airports.json b/airports.json
index 956da03..7cd0cd0 100644
--- a/airports.json
+++ b/airports.json
@@ -323,8 +323,8 @@
         "lon": -95.67313,
         "tz": "America/Chicago"
     },
-    "00U": {
-        "icao": "00U",
+    "K00U": {
+        "icao": "K00U",
         "iata": "",
         "name": "Big Horn County Airport",
         "city": "Hardin",
@@ -1991,8 +1991,8 @@
         "lon": -72.2636032104,
         "tz": "America/New_York"
     },
-    "04W": {
-        "icao": "04W",
+    "K04W": {
+        "icao": "K04W",
         "iata": "",
         "name": "Field Of Dreams Airport",
         "city": "Hinckley",
@@ -2591,8 +2591,8 @@
         "lon": -112.1090011597,
         "tz": "America/Denver"
     },
-    "06N": {
-        "icao": "06N",
+    "K06N": {
+        "icao": "K06N",
         "iata": "",
         "name": "Randall Airport",
         "city": "Middletown",
@@ -2711,8 +2711,8 @@
         "lon": -78.258102417,
         "tz": "America/New_York"
     },
-    "06R": {
-        "icao": "06R",
+    "K06R": {
+        "icao": "K06R",
         "iata": "",
         "name": "Grawunder Field Airport",
         "city": "Bellville",
@@ -2843,8 +2843,8 @@
         "lon": -97.0441970825,
         "tz": "America/Chicago"
     },
-    "06Y": {
-        "icao": "06Y",
+    "K06Y": {
+        "icao": "K06Y",
         "iata": "",
         "name": "Herman Municipal Airport",
         "city": "Herman",
@@ -2951,8 +2951,8 @@
         "lon": -85.9139022827,
         "tz": "America/Indiana/Indianapolis"
     },
-    "07K": {
-        "icao": "07K",
+    "K07K": {
+        "icao": "K07K",
         "iata": "",
         "name": "Central City Municipal Airport/Larry Reineke Field",
         "city": "Central City",
@@ -3203,8 +3203,8 @@
         "lon": -88.3915023804,
         "tz": "America/Chicago"
     },
-    "08A": {
-        "icao": "08A",
+    "K08A": {
+        "icao": "K08A",
         "iata": "",
         "name": "Wetumpka Municipal Airport",
         "city": "Wetumpka",
@@ -3251,8 +3251,8 @@
         "lon": -104.0410003662,
         "tz": "America/Denver"
     },
-    "08F": {
-        "icao": "08F",
+    "K08F": {
+        "icao": "K08F",
         "iata": "",
         "name": "City Of Coalgate Airport",
         "city": "Coalgate",
@@ -3743,8 +3743,8 @@
         "lon": -85.4250030518,
         "tz": "America/Indiana/Indianapolis"
     },
-    "09J": {
-        "icao": "09J",
+    "K09J": {
+        "icao": "K09J",
         "iata": "",
         "name": "Jekyll Island Airport",
         "city": "Jekyll Island",
@@ -4451,8 +4451,8 @@
         "lon": -106.033996582,
         "tz": "America/Denver"
     },
-    "0E0": {
-        "icao": "0E0",
+    "K0E0": {
+        "icao": "K0E0",
         "iata": "",
         "name": "Moriarty Municipal Airport",
         "city": "Moriarty",
@@ -4463,8 +4463,8 @@
         "lon": -106.00002777,
         "tz": "America/Denver"
     },
-    "0E8": {
-        "icao": "0E8",
+    "K0E8": {
+        "icao": "K0E8",
         "iata": "",
         "name": "Crownpoint Airport",
         "city": "Crownpoint",
@@ -4475,8 +4475,8 @@
         "lon": -108.20159611,
         "tz": "America/Denver"
     },
-    "0F3": {
-        "icao": "0F3",
+    "K0F3": {
+        "icao": "K0F3",
         "iata": "",
         "name": "Spirit Lake Municipal Airport",
         "city": "Spirit Lake",
@@ -5195,8 +5195,8 @@
         "lon": -88.6715011597,
         "tz": "America/Chicago"
     },
-    "0J0": {
-        "icao": "0J0",
+    "K0J0": {
+        "icao": "K0J0",
         "iata": "",
         "name": "Abbeville Municipal Airport",
         "city": "Abbeville",
@@ -6431,8 +6431,8 @@
         "lon": -74.2453994751,
         "tz": "America/New_York"
     },
-    "0O4": {
-        "icao": "0O4",
+    "K0O4": {
+        "icao": "K0O4",
         "iata": "",
         "name": "Corning Municipal Airport",
         "city": "Corning",
@@ -6443,8 +6443,8 @@
         "lon": -122.17111666,
         "tz": "America/Los_Angeles"
     },
-    "0O9": {
-        "icao": "0O9",
+    "K0O9": {
+        "icao": "K0O9",
         "iata": "",
         "name": "Ward Field",
         "city": "Gasquet",
@@ -6971,8 +6971,8 @@
         "lon": -76.8454971313,
         "tz": "America/New_York"
     },
-    "0Q3": {
-        "icao": "0Q3",
+    "K0Q3": {
+        "icao": "K0Q3",
         "iata": "",
         "name": "Sonoma Valley Airport",
         "city": "Schellville/Sonoma",
@@ -6983,8 +6983,8 @@
         "lon": -122.449711,
         "tz": "America/Los_Angeles"
     },
-    "0R7": {
-        "icao": "0R7",
+    "K0R7": {
+        "icao": "K0R7",
         "iata": "",
         "name": "The Red River Airport",
         "city": "Coushatta",
@@ -7439,8 +7439,8 @@
         "lon": -96.116897583,
         "tz": "America/Chicago"
     },
-    "0U9": {
-        "icao": "0U9",
+    "K0U9": {
+        "icao": "K0U9",
         "iata": "",
         "name": "Lee Williams Memorial Airport",
         "city": "Midvale",
@@ -8207,8 +8207,8 @@
         "lon": -106.823611,
         "tz": "America/Denver"
     },
-    "10X": {
-        "icao": "10X",
+    "K10X": {
+        "icao": "K10X",
         "iata": "",
         "name": "Ox Ranch Airport",
         "city": "Uvalde",
@@ -8507,8 +8507,8 @@
         "lon": -79.732778,
         "tz": "America/New_York"
     },
-    "11S": {
-        "icao": "11S",
+    "K11S": {
+        "icao": "K11S",
         "iata": "",
         "name": "Sekiu Airport",
         "city": "Sekiu",
@@ -10463,8 +10463,8 @@
         "lon": -80.1276016235,
         "tz": "America/New_York"
     },
-    "16S": {
-        "icao": "16S",
+    "K16S": {
+        "icao": "K16S",
         "iata": "",
         "name": "Myrtle Creek Municipal Airport",
         "city": "Myrtle Creek",
@@ -10547,8 +10547,8 @@
         "lon": -117.6940002441,
         "tz": "America/Los_Angeles"
     },
-    "16X": {
-        "icao": "16X",
+    "K16X": {
+        "icao": "K16X",
         "iata": "",
         "name": "Propwash Airport",
         "city": "Justin",
@@ -11207,8 +11207,8 @@
         "lon": -81.773399353,
         "tz": "America/New_York"
     },
-    "18T": {
-        "icao": "18T",
+    "K18T": {
+        "icao": "K18T",
         "iata": "",
         "name": "Tatum Airport",
         "city": "Tatum",
@@ -11903,8 +11903,8 @@
         "lon": -114.3730010986,
         "tz": "America/Phoenix"
     },
-    "1B1": {
-        "icao": "1B1",
+    "K1B1": {
+        "icao": "K1B1",
         "iata": "HCC",
         "name": "Columbia County Airport",
         "city": "Hudson",
@@ -11915,8 +11915,8 @@
         "lon": -73.71033333,
         "tz": "America/New_York"
     },
-    "1BT": {
-        "icao": "1BT",
+    "K1BT": {
+        "icao": "K1BT",
         "iata": "",
         "name": "Bonne Terre Municipal Airport",
         "city": "Bonne Terre",
@@ -12095,8 +12095,8 @@
         "lon": -104.6579971313,
         "tz": "America/Denver"
     },
-    "1D6": {
-        "icao": "1D6",
+    "K1D6": {
+        "icao": "K1D6",
         "iata": "",
         "name": "Hector Municipal Airport",
         "city": "Hector",
@@ -12359,8 +12359,8 @@
         "lon": -84.7181015015,
         "tz": "America/New_York"
     },
-    "1H6": {
-        "icao": "1H6",
+    "K1H6": {
+        "icao": "K1H6",
         "iata": "",
         "name": "Harvey Young Airport",
         "city": "Tulsa",
@@ -12371,8 +12371,8 @@
         "lon": -95.82505555,
         "tz": "America/Chicago"
     },
-    "1I9": {
-        "icao": "1I9",
+    "K1I9": {
+        "icao": "K1I9",
         "iata": "",
         "name": "Delphi Municipal Airport",
         "city": "Delphi",
@@ -12779,8 +12779,8 @@
         "lon": -121.0530014038,
         "tz": "America/Los_Angeles"
     },
-    "1K5": {
-        "icao": "1K5",
+    "K1K5": {
+        "icao": "K1K5",
         "iata": "",
         "name": "Waynoka Municipal Airport",
         "city": "Waynoka",
@@ -12791,8 +12791,8 @@
         "lon": -98.85466388,
         "tz": "America/Chicago"
     },
-    "1K8": {
-        "icao": "1K8",
+    "K1K8": {
+        "icao": "K1K8",
         "iata": "",
         "name": "South Grand Lake Regional Airport",
         "city": "Ketchum",
@@ -12803,8 +12803,8 @@
         "lon": -95.01352777,
         "tz": "America/Chicago"
     },
-    "1KS": {
-        "icao": "1KS",
+    "K1KS": {
+        "icao": "K1KS",
         "iata": "",
         "name": "Linn County Airport",
         "city": "Pleasanton",
@@ -12947,8 +12947,8 @@
         "lon": -84.1808013916,
         "tz": "America/New_York"
     },
-    "1L1": {
-        "icao": "1L1",
+    "K1L1": {
+        "icao": "K1L1",
         "iata": "",
         "name": "Lincoln County Airport",
         "city": "Panaca",
@@ -13115,8 +13115,8 @@
         "lon": -91.4987030029,
         "tz": "America/Chicago"
     },
-    "1M7": {
-        "icao": "1M7",
+    "K1M7": {
+        "icao": "K1M7",
         "iata": "",
         "name": "Fulton Airport",
         "city": "Fulton",
@@ -13643,8 +13643,8 @@
         "lon": -96.1943969727,
         "tz": "America/Chicago"
     },
-    "1N7": {
-        "icao": "1N7",
+    "K1N7": {
+        "icao": "K1N7",
         "iata": "",
         "name": "Blairstown Airport",
         "city": "Blairstown",
@@ -14627,8 +14627,8 @@
         "lon": -75.3704986572,
         "tz": "America/New_York"
     },
-    "1QK": {
-        "icao": "1QK",
+    "K1QK": {
+        "icao": "K1QK",
         "iata": "",
         "name": "Gove County Airport",
         "city": "Quinter",
@@ -14639,8 +14639,8 @@
         "lon": -100.23388833,
         "tz": "America/Chicago"
     },
-    "1S2": {
-        "icao": "1S2",
+    "K1S2": {
+        "icao": "K1S2",
         "iata": "",
         "name": "Darrington Municipal Airport",
         "city": "Darrington",
@@ -14651,8 +14651,8 @@
         "lon": -121.6102036,
         "tz": "America/Los_Angeles"
     },
-    "1S6": {
-        "icao": "1S6",
+    "K1S6": {
+        "icao": "K1S6",
         "iata": "",
         "name": "Priest River Municipal Airport",
         "city": "Priest River",
@@ -15647,8 +15647,8 @@
         "lon": -98.2208023071,
         "tz": "America/Chicago"
     },
-    "1Y5": {
-        "icao": "1Y5",
+    "K1Y5": {
+        "icao": "K1Y5",
         "iata": "",
         "name": "New Hampton Municipal Airport",
         "city": "New Hampton",
@@ -16883,8 +16883,8 @@
         "lon": -90.079498291,
         "tz": "America/Chicago"
     },
-    "23M": {
-        "icao": "23M",
+    "K23M": {
+        "icao": "K23M",
         "iata": "",
         "name": "Clarke County Airport",
         "city": "Quitman",
@@ -17207,8 +17207,8 @@
         "lon": -110.9349975586,
         "tz": "America/Phoenix"
     },
-    "24C": {
-        "icao": "24C",
+    "K24C": {
+        "icao": "K24C",
         "iata": "",
         "name": "Lowell City Airport",
         "city": "Lowell",
@@ -18131,8 +18131,8 @@
         "lon": -110.4420013428,
         "tz": "America/Denver"
     },
-    "26N": {
-        "icao": "26N",
+    "K26N": {
+        "icao": "K26N",
         "iata": "",
         "name": "Ocean City Municipal Airport",
         "city": "Ocean City",
@@ -19823,8 +19823,8 @@
         "lon": -75.5721969604,
         "tz": "America/New_York"
     },
-    "2F6": {
-        "icao": "2F6",
+    "K2F6": {
+        "icao": "K2F6",
         "iata": "",
         "name": "Skiatook Municipal Airport",
         "city": "Skiatook",
@@ -20567,8 +20567,8 @@
         "lon": -88.7078018188,
         "tz": "America/Chicago"
     },
-    "2J9": {
-        "icao": "2J9",
+    "K2J9": {
+        "icao": "K2J9",
         "iata": "",
         "name": "Quincy Municipal Airport",
         "city": "Quincy",
@@ -20747,8 +20747,8 @@
         "lon": -84.8499984741,
         "tz": "America/New_York"
     },
-    "2L1": {
-        "icao": "2L1",
+    "K2L1": {
+        "icao": "K2L1",
         "iata": "",
         "name": "Larimore Municipal Airport",
         "city": "Larimore",
@@ -22235,8 +22235,8 @@
         "lon": -122.6849975586,
         "tz": "America/Los_Angeles"
     },
-    "2P7": {
-        "icao": "2P7",
+    "K2P7": {
+        "icao": "K2P7",
         "iata": "",
         "name": "Alderman Airport",
         "city": "St Clairsville",
@@ -22439,8 +22439,8 @@
         "lon": -77.0413970947,
         "tz": "America/New_York"
     },
-    "2S5": {
-        "icao": "2S5",
+    "K2S5": {
+        "icao": "K2S5",
         "iata": "",
         "name": "Waterville Airport",
         "city": "Waterville",
@@ -22451,8 +22451,8 @@
         "lon": -120.05646277,
         "tz": "America/Los_Angeles"
     },
-    "2S6": {
-        "icao": "2S6",
+    "K2S6": {
+        "icao": "K2S6",
         "iata": "",
         "name": "Sportsman Airpark",
         "city": "Newberg",
@@ -23003,8 +23003,8 @@
         "lon": -97.379699707,
         "tz": "America/Chicago"
     },
-    "2U4": {
-        "icao": "2U4",
+    "K2U4": {
+        "icao": "K2U4",
         "iata": "",
         "name": "Rockford Municipal Airport",
         "city": "Rockford",
@@ -23747,8 +23747,8 @@
         "lon": -105.3359985352,
         "tz": "America/Denver"
     },
-    "30F": {
-        "icao": "30F",
+    "K30F": {
+        "icao": "K30F",
         "iata": "",
         "name": "Lakeview Airport",
         "city": "Lake Dallas",
@@ -24839,8 +24839,8 @@
         "lon": -94.0569000244,
         "tz": "America/Chicago"
     },
-    "33N": {
-        "icao": "33N",
+    "K33N": {
+        "icao": "K33N",
         "iata": "",
         "name": "Delaware Airpark",
         "city": "Dover/Cheswold",
@@ -26195,8 +26195,8 @@
         "lon": -89.9971008301,
         "tz": "America/Chicago"
     },
-    "37M": {
-        "icao": "37M",
+    "K37M": {
+        "icao": "K37M",
         "iata": "",
         "name": "Hornersville Memorial Airport",
         "city": "Hornersville",
@@ -26339,8 +26339,8 @@
         "lon": -98.8656005859,
         "tz": "America/Chicago"
     },
-    "37V": {
-        "icao": "37V",
+    "K37V": {
+        "icao": "K37V",
         "iata": "AHF",
         "name": "Arapahoe Municipal Airport",
         "city": "Arapahoe",
@@ -26531,8 +26531,8 @@
         "lon": -91.3584976196,
         "tz": "America/Chicago"
     },
-    "38K": {
-        "icao": "38K",
+    "K38K": {
+        "icao": "K38K",
         "iata": "",
         "name": "Lucas Airport",
         "city": "Lucas",
@@ -26987,8 +26987,8 @@
         "lon": -93.2049026489,
         "tz": "America/Chicago"
     },
-    "39N": {
-        "icao": "39N",
+    "K39N": {
+        "icao": "K39N",
         "iata": "",
         "name": "Princeton Airport",
         "city": "Princeton/Rocky Hill",
@@ -27107,8 +27107,8 @@
         "lon": -90.6199035645,
         "tz": "America/Chicago"
     },
-    "3A5": {
-        "icao": "3A5",
+    "K3A5": {
+        "icao": "K3A5",
         "iata": "",
         "name": "Flying M Ranch Airport",
         "city": "Yerington",
@@ -27431,8 +27431,8 @@
         "lon": -109.6529998779,
         "tz": "America/Phoenix"
     },
-    "3C1": {
-        "icao": "3C1",
+    "K3C1": {
+        "icao": "K3C1",
         "iata": "",
         "name": "Mishawaka Pilots Club Airport",
         "city": "Elkhart",
@@ -27563,8 +27563,8 @@
         "lon": -104.5660018921,
         "tz": "America/Denver"
     },
-    "3D1": {
-        "icao": "3D1",
+    "K3D1": {
+        "icao": "K3D1",
         "iata": "",
         "name": "Crivitz Municipal Airport",
         "city": "Crivitz",
@@ -27575,8 +27575,8 @@
         "lon": -88.07329816,
         "tz": "America/Chicago"
     },
-    "3D2": {
-        "icao": "3D2",
+    "K3D2": {
+        "icao": "K3D2",
         "iata": "",
         "name": "Ephraim-Gibraltar Airport",
         "city": "Ephraim",
@@ -27587,8 +27587,8 @@
         "lon": -87.18812808,
         "tz": "America/Chicago"
     },
-    "3DA": {
-        "icao": "3DA",
+    "K3DA": {
+        "icao": "K3DA",
         "iata": "",
         "name": "Dalton Airport",
         "city": "Flushing",
@@ -28991,8 +28991,8 @@
         "lon": -109.365,
         "tz": "America/Denver"
     },
-    "3N8": {
-        "icao": "3N8",
+    "K3N8": {
+        "icao": "K3N8",
         "iata": "",
         "name": "Mahnomen County Airport",
         "city": "Mahnomen",
@@ -29411,8 +29411,8 @@
         "lon": -78.6731033325,
         "tz": "America/New_York"
     },
-    "3O5": {
-        "icao": "3O5",
+    "K3O5": {
+        "icao": "K3O5",
         "iata": "",
         "name": "Walters Municipal Airport",
         "city": "Walters",
@@ -30119,8 +30119,8 @@
         "lon": -100.0070037842,
         "tz": "America/Chicago"
     },
-    "3TE": {
-        "icao": "3TE",
+    "K3TE": {
+        "icao": "K3TE",
         "iata": "",
         "name": "Meyers\u2013Diver's Airport",
         "city": "Tecumseh",
@@ -30647,8 +30647,8 @@
         "lon": -79.133889,
         "tz": "America/New_York"
     },
-    "3W2": {
-        "icao": "3W2",
+    "K3W2": {
+        "icao": "K3W2",
         "iata": "",
         "name": "Put-in-Bay Airport",
         "city": "Put-in-Bay",
@@ -30659,8 +30659,8 @@
         "lon": -82.82833333,
         "tz": "America/New_York"
     },
-    "3W5": {
-        "icao": "3W5",
+    "K3W5": {
+        "icao": "K3W5",
         "iata": "",
         "name": "Mears Field",
         "city": "Concrete",
@@ -31643,8 +31643,8 @@
         "lon": -112.0650024414,
         "tz": "America/Phoenix"
     },
-    "42B": {
-        "icao": "42B",
+    "K42B": {
+        "icao": "K42B",
         "iata": "",
         "name": "Goodspeed Airport",
         "city": "East Haddam",
@@ -31655,8 +31655,8 @@
         "lon": -72.4556425,
         "tz": "America/New_York"
     },
-    "42C": {
-        "icao": "42C",
+    "K42C": {
+        "icao": "K42C",
         "iata": "",
         "name": "White Cloud Airport",
         "city": "White Cloud",
@@ -31691,8 +31691,8 @@
         "lon": -86.7677993774,
         "tz": "America/Chicago"
     },
-    "42J": {
-        "icao": "42J",
+    "K42J": {
+        "icao": "K42J",
         "iata": "",
         "name": "Keystone Heights Airport",
         "city": "Keystone Heights",
@@ -32015,8 +32015,8 @@
         "lon": -87.676399231,
         "tz": "America/Chicago"
     },
-    "43K": {
-        "icao": "43K",
+    "K43K": {
+        "icao": "K43K",
         "iata": "",
         "name": "Marion Municipal Airport",
         "city": "Marion",
@@ -32231,8 +32231,8 @@
         "lon": -91.7325,
         "tz": "America/Chicago"
     },
-    "44A": {
-        "icao": "44A",
+    "K44A": {
+        "icao": "K44A",
         "iata": "",
         "name": "Rolle Airfield",
         "city": "San Luis",
@@ -32435,8 +32435,8 @@
         "lon": -94.3099975586,
         "tz": "America/Chicago"
     },
-    "44N": {
-        "icao": "44N",
+    "K44N": {
+        "icao": "K44N",
         "iata": "",
         "name": "Sky Acres Airport",
         "city": "Millbrook",
@@ -33467,8 +33467,8 @@
         "lon": -93.9905014038,
         "tz": "America/Chicago"
     },
-    "47N": {
-        "icao": "47N",
+    "K47N": {
+        "icao": "K47N",
         "iata": "JVI",
         "name": "Central Jersey Regional Airport",
         "city": "Manville",
@@ -33899,8 +33899,8 @@
         "lon": -103.2949981689,
         "tz": "America/Chicago"
     },
-    "48Y": {
-        "icao": "48Y",
+    "K48Y": {
+        "icao": "K48Y",
         "iata": "",
         "name": "Piney Pinecreek Border Airport",
         "city": "Pinecreek",
@@ -34487,8 +34487,8 @@
         "lon": -109.7620010376,
         "tz": "America/Phoenix"
     },
-    "4B0": {
-        "icao": "4B0",
+    "K4B0": {
+        "icao": "K4B0",
         "iata": "",
         "name": "South Albany Airport",
         "city": "South Bethlehem",
@@ -34619,8 +34619,8 @@
         "lon": -104.8160018921,
         "tz": "America/Denver"
     },
-    "4D8": {
-        "icao": "4D8",
+    "K4D8": {
+        "icao": "K4D8",
         "iata": "",
         "name": "Fuller Airport",
         "city": "Milford",
@@ -34631,8 +34631,8 @@
         "lon": -95.1590925,
         "tz": "America/Chicago"
     },
-    "4D9": {
-        "icao": "4D9",
+    "K4D9": {
+        "icao": "K4D9",
         "iata": "",
         "name": "Alma Municipal Airport",
         "city": "Alma",
@@ -34643,8 +34643,8 @@
         "lon": -99.34641666,
         "tz": "America/Chicago"
     },
-    "4F1": {
-        "icao": "4F1",
+    "K4F1": {
+        "icao": "K4F1",
         "iata": "",
         "name": "Westport Airport",
         "city": "Westport",
@@ -34811,8 +34811,8 @@
         "lon": -81.6470031738,
         "tz": "America/New_York"
     },
-    "4G1": {
-        "icao": "4G1",
+    "K4G1": {
+        "icao": "K4G1",
         "iata": "",
         "name": "Greenville Municipal Airport",
         "city": "Greenville",
@@ -34823,8 +34823,8 @@
         "lon": -80.39119675,
         "tz": "America/New_York"
     },
-    "4G7": {
-        "icao": "4G7",
+    "K4G7": {
+        "icao": "K4G7",
         "iata": "",
         "name": "Fairmont Municipal Airport-Frankman Field",
         "city": "Fairmont",
@@ -35579,8 +35579,8 @@
         "lon": -89.4236984253,
         "tz": "America/Chicago"
     },
-    "4M5": {
-        "icao": "4M5",
+    "K4M5": {
+        "icao": "K4M5",
         "iata": "",
         "name": "Dermott Municipal Airport",
         "city": "Dermott",
@@ -35591,8 +35591,8 @@
         "lon": -91.44261138,
         "tz": "America/Chicago"
     },
-    "4M8": {
-        "icao": "4M8",
+    "K4M8": {
+        "icao": "K4M8",
         "iata": "",
         "name": "Clarendon Municipal Airport",
         "city": "Clarendon",
@@ -36059,8 +36059,8 @@
         "lon": -111.1449966431,
         "tz": "America/Denver"
     },
-    "4N1": {
-        "icao": "4N1",
+    "K4N1": {
+        "icao": "K4N1",
         "iata": "",
         "name": "Greenwood Lake Airport",
         "city": "West Milford",
@@ -36935,8 +36935,8 @@
         "lon": -75.9436035156,
         "tz": "America/New_York"
     },
-    "4S5": {
-        "icao": "4S5",
+    "K4S5": {
+        "icao": "K4S5",
         "iata": "",
         "name": "St. Thomas Municipal Airport",
         "city": "St. Thomas",
@@ -37367,8 +37367,8 @@
         "lon": -97.2238998413,
         "tz": "America/Chicago"
     },
-    "4V0": {
-        "icao": "4V0",
+    "K4V0": {
+        "icao": "K4V0",
         "iata": "",
         "name": "Rangely Airport",
         "city": "Rangely",
@@ -38111,8 +38111,8 @@
         "lon": -75.3496017456,
         "tz": "America/New_York"
     },
-    "50S": {
-        "icao": "50S",
+    "K50S": {
+        "icao": "K50S",
         "iata": "",
         "name": "Parma Airport",
         "city": "Parma",
@@ -38363,8 +38363,8 @@
         "lon": -92.116653,
         "tz": "America/Chicago"
     },
-    "51M": {
-        "icao": "51M",
+    "K51M": {
+        "icao": "K51M",
         "iata": "",
         "name": "Oscoda County/Dennis Kauffman Memorial Airport",
         "city": "Mio",
@@ -38555,8 +38555,8 @@
         "lon": -118.362028,
         "tz": "America/Los_Angeles"
     },
-    "52A": {
-        "icao": "52A",
+    "K52A": {
+        "icao": "K52A",
         "iata": "",
         "name": "Madison Municipal Airport",
         "city": "Madison",
@@ -38831,8 +38831,8 @@
         "lon": -76.004699707,
         "tz": "America/New_York"
     },
-    "52S": {
-        "icao": "52S",
+    "K52S": {
+        "icao": "K52S",
         "iata": "",
         "name": "St. Ignatius Airport",
         "city": "St. Ignatius",
@@ -40667,8 +40667,8 @@
         "lon": -112.4449996948,
         "tz": "America/Phoenix"
     },
-    "59B": {
-        "icao": "59B",
+    "K59B": {
+        "icao": "K59B",
         "iata": "",
         "name": "Newton Field",
         "city": "Jackman",
@@ -41219,8 +41219,8 @@
         "lon": -109.9879989624,
         "tz": "America/Phoenix"
     },
-    "5B7": {
-        "icao": "5B7",
+    "K5B7": {
+        "icao": "K5B7",
         "iata": "",
         "name": "Rensselaer County Airport",
         "city": "Troy",
@@ -41231,8 +41231,8 @@
         "lon": -73.57997222,
         "tz": "America/New_York"
     },
-    "5B9": {
-        "icao": "5B9",
+    "K5B9": {
+        "icao": "K5B9",
         "iata": "",
         "name": "Dean Memorial Airport",
         "city": "Haverhill",
@@ -41627,8 +41627,8 @@
         "lon": -86.2129974365,
         "tz": "America/Chicago"
     },
-    "5G0": {
-        "icao": "5G0",
+    "K5G0": {
+        "icao": "K5G0",
         "iata": "",
         "name": "Le Roy Airport",
         "city": "Le Roy",
@@ -41639,8 +41639,8 @@
         "lon": -77.93524805,
         "tz": "America/New_York"
     },
-    "5G8": {
-        "icao": "5G8",
+    "K5G8": {
+        "icao": "K5G8",
         "iata": "",
         "name": "Greensburg Jeannette Regional Airport",
         "city": "Jeannette",
@@ -41975,8 +41975,8 @@
         "lon": -91.0501022339,
         "tz": "America/Chicago"
     },
-    "5K2": {
-        "icao": "5K2",
+    "K5K2": {
+        "icao": "K5K2",
         "iata": "",
         "name": "Tribune Municipal Airport",
         "city": "Tribune",
@@ -42287,8 +42287,8 @@
         "lon": -93.7077026367,
         "tz": "America/Chicago"
     },
-    "5M0": {
-        "icao": "5M0",
+    "K5M0": {
+        "icao": "K5M0",
         "iata": "",
         "name": "Hartselle\u2013Morgan County Regional Airport",
         "city": "Hartselle",
@@ -42299,8 +42299,8 @@
         "lon": -86.93294444,
         "tz": "America/Chicago"
     },
-    "5M1": {
-        "icao": "5M1",
+    "K5M1": {
+        "icao": "K5M1",
         "iata": "",
         "name": "Dewitt Municipal Airport/Whitcomb Field",
         "city": "De Witt",
@@ -43007,8 +43007,8 @@
         "lon": -74.4098968506,
         "tz": "America/New_York"
     },
-    "5O1": {
-        "icao": "5O1",
+    "K5O1": {
+        "icao": "K5O1",
         "iata": "",
         "name": "Vici Municipal Airport",
         "city": "Vici",
@@ -43907,8 +43907,8 @@
         "lon": -99.5261993408,
         "tz": "America/Chicago"
     },
-    "5U8": {
-        "icao": "5U8",
+    "K5U8": {
+        "icao": "K5U8",
         "iata": "",
         "name": "Geraldine Airport",
         "city": "Geraldine",
@@ -44531,8 +44531,8 @@
         "lon": -115.5589981079,
         "tz": "America/Los_Angeles"
     },
-    "61D": {
-        "icao": "61D",
+    "K61D": {
+        "icao": "K61D",
         "iata": "",
         "name": "Plainwell Municipal Airport",
         "city": "Plainwell",
@@ -45767,8 +45767,8 @@
         "lon": -99.3373031616,
         "tz": "America/Chicago"
     },
-    "64V": {
-        "icao": "64V",
+    "K64V": {
+        "icao": "K64V",
         "iata": "",
         "name": "Wallace Municipal Airport",
         "city": "Wallace",
@@ -47555,8 +47555,8 @@
         "lon": -111.1200027466,
         "tz": "America/Phoenix"
     },
-    "6B0": {
-        "icao": "6B0",
+    "K6B0": {
+        "icao": "K6B0",
         "iata": "",
         "name": "Middlebury State Airport",
         "city": "Middlebury",
@@ -47567,8 +47567,8 @@
         "lon": -73.09555166,
         "tz": "America/New_York"
     },
-    "6B4": {
-        "icao": "6B4",
+    "K6B4": {
+        "icao": "K6B4",
         "iata": "",
         "name": "Frankfort-Highland Airport",
         "city": "Utica/Frankfort",
@@ -47579,8 +47579,8 @@
         "lon": -75.16954166,
         "tz": "America/New_York"
     },
-    "6B6": {
-        "icao": "6B6",
+    "K6B6": {
+        "icao": "K6B6",
         "iata": "MMN",
         "name": "Minute Man Air Field",
         "city": "Stow",
@@ -47783,8 +47783,8 @@
         "lon": -105.145833,
         "tz": "America/Denver"
     },
-    "6D3": {
-        "icao": "6D3",
+    "K6D3": {
+        "icao": "K6D3",
         "iata": "",
         "name": "Maddock Municipal Airport",
         "city": "Maddock",
@@ -47795,8 +47795,8 @@
         "lon": -99.52695972,
         "tz": "America/Chicago"
     },
-    "6F1": {
-        "icao": "6F1",
+    "K6F1": {
+        "icao": "K6F1",
         "iata": "",
         "name": "Talihina Municipal Airport",
         "city": "Talihina",
@@ -48299,8 +48299,8 @@
         "lon": -87.9052963257,
         "tz": "America/Chicago"
     },
-    "6J8": {
-        "icao": "6J8",
+    "K6J8": {
+        "icao": "K6J8",
         "iata": "",
         "name": "Oak Tree Landing Airport",
         "city": "High Springs",
@@ -48455,8 +48455,8 @@
         "lon": -89.051693,
         "tz": "America/Chicago"
     },
-    "6L4": {
-        "icao": "6L4",
+    "K6L4": {
+        "icao": "K6L4",
         "iata": "",
         "name": "Logan County Airport",
         "city": "Logan",
@@ -48599,8 +48599,8 @@
         "lon": -87.7253036499,
         "tz": "America/Chicago"
     },
-    "6M8": {
-        "icao": "6M8",
+    "K6M8": {
+        "icao": "K6M8",
         "iata": "",
         "name": "Marked Tree Municipal Airport",
         "city": "Marked Tree",
@@ -49727,8 +49727,8 @@
         "lon": -117.6259994507,
         "tz": "America/Los_Angeles"
     },
-    "6P7": {
-        "icao": "6P7",
+    "K6P7": {
+        "icao": "K6P7",
         "iata": "",
         "name": "Mcville Airport",
         "city": "Freeport",
@@ -49895,8 +49895,8 @@
         "lon": -75.698783,
         "tz": "America/New_York"
     },
-    "6R1": {
-        "icao": "6R1",
+    "K6R1": {
+        "icao": "K6R1",
         "iata": "",
         "name": "Welsh Airport",
         "city": "Welsh",
@@ -50327,8 +50327,8 @@
         "lon": -102.7919998169,
         "tz": "America/Chicago"
     },
-    "6V0": {
-        "icao": "6V0",
+    "K6V0": {
+        "icao": "K6V0",
         "iata": "",
         "name": "Edgemont Municipal Airport",
         "city": "Edgemont",
@@ -50675,8 +50675,8 @@
         "lon": -98.3795013428,
         "tz": "America/Chicago"
     },
-    "6Y8": {
-        "icao": "6Y8",
+    "K6Y8": {
+        "icao": "K6Y8",
         "iata": "",
         "name": "Welke Airport",
         "city": "Beaver Island",
@@ -51443,8 +51443,8 @@
         "lon": -120.9550018311,
         "tz": "America/Los_Angeles"
     },
-    "72S": {
-        "icao": "72S",
+    "K72S": {
+        "icao": "K72S",
         "iata": "",
         "name": "Rosalia Municipal Airport",
         "city": "Rosalia",
@@ -54203,8 +54203,8 @@
         "lon": -85.1175003052,
         "tz": "America/New_York"
     },
-    "7I2": {
-        "icao": "7I2",
+    "K7I2": {
+        "icao": "K7I2",
         "iata": "",
         "name": "Reese Airport",
         "city": "Muncie",
@@ -54755,8 +54755,8 @@
         "lon": -89.4709014893,
         "tz": "America/Chicago"
     },
-    "7M6": {
-        "icao": "7M6",
+    "K7M6": {
+        "icao": "K7M6",
         "iata": "",
         "name": "Paris Municipal Airport",
         "city": "Paris",
@@ -54767,8 +54767,8 @@
         "lon": -93.68161388,
         "tz": "America/Chicago"
     },
-    "7M7": {
-        "icao": "7M7",
+    "K7M7": {
+        "icao": "K7M7",
         "iata": "",
         "name": "Piggott Municipal Airport",
         "city": "Piggott",
@@ -56363,8 +56363,8 @@
         "lon": -94.4376983643,
         "tz": "America/Chicago"
     },
-    "7V5": {
-        "icao": "7V5",
+    "K7V5": {
+        "icao": "K7V5",
         "iata": "",
         "name": "Brush Municipal Airport",
         "city": "Brush",
@@ -56411,8 +56411,8 @@
         "lon": -77.7872009277,
         "tz": "America/New_York"
     },
-    "7W4": {
-        "icao": "7W4",
+    "K7W4": {
+        "icao": "K7W4",
         "iata": "",
         "name": "Lake Anna Airport",
         "city": "Bumpass",
@@ -56663,8 +56663,8 @@
         "lon": -98.931098938,
         "tz": "America/Chicago"
     },
-    "7Y2": {
-        "icao": "7Y2",
+    "K7Y2": {
+        "icao": "K7Y2",
         "iata": "",
         "name": "Thompsonville Airport",
         "city": "Thompsonville",
@@ -57455,8 +57455,8 @@
         "lon": -99.6503982544,
         "tz": "America/Chicago"
     },
-    "82V": {
-        "icao": "82V",
+    "K82V": {
+        "icao": "K82V",
         "iata": "",
         "name": "Pine Bluffs Municipal Airport",
         "city": "Pine Bluffs",
@@ -58019,8 +58019,8 @@
         "lon": -99.398889,
         "tz": "America/Chicago"
     },
-    "84Y": {
-        "icao": "84Y",
+    "K84Y": {
+        "icao": "K84Y",
         "iata": "",
         "name": "Bloomfield Municipal Airport",
         "city": "Bloomfield",
@@ -59471,8 +59471,8 @@
         "lon": -90.0320968628,
         "tz": "America/Chicago"
     },
-    "8A7": {
-        "icao": "8A7",
+    "K8A7": {
+        "icao": "K8A7",
         "iata": "",
         "name": "Twin Lakes Airport",
         "city": "Mocksville",
@@ -59615,8 +59615,8 @@
         "lon": -109.056917,
         "tz": "America/Denver"
     },
-    "8B2": {
-        "icao": "8B2",
+    "K8B2": {
+        "icao": "K8B2",
         "iata": "",
         "name": "Twin Mountain Airport",
         "city": "Twin Mountain",
@@ -59807,8 +59807,8 @@
         "lon": -104.5810012817,
         "tz": "America/Denver"
     },
-    "8D4": {
-        "icao": "8D4",
+    "K8D4": {
+        "icao": "K8D4",
         "iata": "",
         "name": "Miller\u2013Sparta Airport",
         "city": "Sparta",
@@ -60251,8 +60251,8 @@
         "lon": -87.9916992188,
         "tz": "America/Chicago"
     },
-    "8K8": {
-        "icao": "8K8",
+    "K8K8": {
+        "icao": "K8K8",
         "iata": "",
         "name": "Cimarron Municipal Airport",
         "city": "Cimarron",
@@ -61547,8 +61547,8 @@
         "lon": -80.1628036499,
         "tz": "America/New_York"
     },
-    "8S4": {
-        "icao": "8S4",
+    "K8S4": {
+        "icao": "K8S4",
         "iata": "",
         "name": "Enterprise Municipal Airport",
         "city": "Enterprise",
@@ -62087,8 +62087,8 @@
         "lon": -78.9621963501,
         "tz": "America/New_York"
     },
-    "8W3": {
-        "icao": "8W3",
+    "K8W3": {
+        "icao": "K8W3",
         "iata": "",
         "name": "Mansfield Airport",
         "city": "Mansfield",
@@ -62639,8 +62639,8 @@
         "lon": -88.7083969116,
         "tz": "America/Chicago"
     },
-    "91C": {
-        "icao": "91C",
+    "K91C": {
+        "icao": "K91C",
         "iata": "",
         "name": "Sauk-Prairie Airport",
         "city": "Prairie Du Sac",
@@ -65471,8 +65471,8 @@
         "lon": -83.6523971558,
         "tz": "America/New_York"
     },
-    "9G0": {
-        "icao": "9G0",
+    "K9G0": {
+        "icao": "K9G0",
         "iata": "",
         "name": "Buffalo Airfield",
         "city": "Buffalo",
@@ -65483,8 +65483,8 @@
         "lon": -78.71658444,
         "tz": "America/New_York"
     },
-    "9G1": {
-        "icao": "9G1",
+    "K9G1": {
+        "icao": "K9G1",
         "iata": "",
         "name": "Pittsburgh Northeast Airport",
         "city": "Pittsburgh",
@@ -73187,8 +73187,8 @@
         "lon": 21.0358009338,
         "tz": "Europe/Belgrade"
     },
-    "C24": {
-        "icao": "C24",
+    "KC24": {
+        "icao": "KC24",
         "iata": "",
         "name": "Mineral County Memorial Airport",
         "city": "Creede",
@@ -73199,8 +73199,8 @@
         "lon": -106.92988888,
         "tz": "America/Denver"
     },
-    "C25": {
-        "icao": "C25",
+    "KC25": {
+        "icao": "KC25",
         "iata": "",
         "name": "Waverly Municipal Airport",
         "city": "Waverly",
@@ -73211,8 +73211,8 @@
         "lon": -92.50721333,
         "tz": "America/Chicago"
     },
-    "C56": {
-        "icao": "C56",
+    "KC56": {
+        "icao": "KC56",
         "iata": "",
         "name": "Bult Field",
         "city": "Monee",
@@ -73223,8 +73223,8 @@
         "lon": -87.684475,
         "tz": "America/Chicago"
     },
-    "C59": {
-        "icao": "C59",
+    "KC59": {
+        "icao": "KC59",
         "iata": "",
         "name": "Lake Lawn Airport",
         "city": "Delavan",
@@ -73235,8 +73235,8 @@
         "lon": -88.60112916,
         "tz": "America/Chicago"
     },
-    "C66": {
-        "icao": "C66",
+    "KC66": {
+        "icao": "KC66",
         "iata": "",
         "name": "Monmouth Municipal Airport",
         "city": "Monmouth",
@@ -73247,8 +73247,8 @@
         "lon": -90.63110722,
         "tz": "America/Chicago"
     },
-    "C80": {
-        "icao": "C80",
+    "KC80": {
+        "icao": "KC80",
         "iata": "",
         "name": "New Coalinga Municipal Airport",
         "city": "Coalinga",
@@ -89531,8 +89531,8 @@
         "lon": -103.1719970703,
         "tz": "America/Regina"
     },
-    "D15": {
-        "icao": "D15",
+    "KD15": {
+        "icao": "KD15",
         "iata": "",
         "name": "Lake Isabella - Cal Brewer Memorial Airport",
         "city": "Lake Isabella",
@@ -89543,8 +89543,8 @@
         "lon": -84.98196833,
         "tz": "America/Detroit"
     },
-    "D29": {
-        "icao": "D29",
+    "KD29": {
+        "icao": "KD29",
         "iata": "",
         "name": "Drayton Municipal Airport",
         "city": "Drayton",
@@ -89555,8 +89555,8 @@
         "lon": -97.17589722,
         "tz": "America/Chicago"
     },
-    "D41": {
-        "icao": "D41",
+    "KD41": {
+        "icao": "KD41",
         "iata": "",
         "name": "Stephen Municipal Airport",
         "city": "Stephen",
@@ -89567,8 +89567,8 @@
         "lon": -96.86283888,
         "tz": "America/Chicago"
     },
-    "D61": {
-        "icao": "D61",
+    "KD61": {
+        "icao": "KD61",
         "iata": "",
         "name": "Towner Municipal Airport",
         "city": "Towner",
@@ -89579,8 +89579,8 @@
         "lon": -100.39561233,
         "tz": "America/Chicago"
     },
-    "D63": {
-        "icao": "D63",
+    "KD63": {
+        "icao": "KD63",
         "iata": "",
         "name": "Dinsmore Airport",
         "city": "Dinsmore",
@@ -89591,8 +89591,8 @@
         "lon": -123.59822138,
         "tz": "America/Los_Angeles"
     },
-    "D73": {
-        "icao": "D73",
+    "KD73": {
+        "icao": "KD73",
         "iata": "",
         "name": "Cy Nunnally Memorial Airport",
         "city": "Monroe",
@@ -92495,8 +92495,8 @@
         "lon": 1.2545100451,
         "tz": "Africa/Lome"
     },
-    "E36": {
-        "icao": "E36",
+    "KE36": {
+        "icao": "KE36",
         "iata": "",
         "name": "Georgetown Airport",
         "city": "Georgetown",
@@ -92507,8 +92507,8 @@
         "lon": -120.86480555,
         "tz": "America/Los_Angeles"
     },
-    "E55": {
-        "icao": "E55",
+    "KE55": {
+        "icao": "KE55",
         "iata": "",
         "name": "Ocean Ridge Airport",
         "city": "Gualala",
@@ -92519,8 +92519,8 @@
         "lon": -123.53055222,
         "tz": "America/Los_Angeles"
     },
-    "E70": {
-        "icao": "E70",
+    "KE70": {
+        "icao": "KE70",
         "iata": "",
         "name": "Huber Airpark Civic Club LLC",
         "city": "Seguin",
@@ -109463,8 +109463,8 @@
         "lon": 26.2569007874,
         "tz": "Europe/Riga"
     },
-    "F46": {
-        "icao": "F46",
+    "KF46": {
+        "icao": "KF46",
         "iata": "",
         "name": "Ralph M. Hall/Rockwall Municipal Airport",
         "city": "Rockwall",
@@ -109475,8 +109475,8 @@
         "lon": -96.435278,
         "tz": "America/Chicago"
     },
-    "F81": {
-        "icao": "F81",
+    "KF81": {
+        "icao": "KF81",
         "iata": "",
         "name": "Okemah Municipal Airport",
         "city": "Okemah",
@@ -109487,8 +109487,8 @@
         "lon": -96.30553888,
         "tz": "America/Chicago"
     },
-    "F92": {
-        "icao": "F92",
+    "KF92": {
+        "icao": "KF92",
         "iata": "",
         "name": "Kingfisher Airport",
         "city": "Kingfisher",
@@ -109499,8 +109499,8 @@
         "lon": -97.9529375,
         "tz": "America/Chicago"
     },
-    "F95": {
-        "icao": "F95",
+    "KF95": {
+        "icao": "KF95",
         "iata": "",
         "name": "Calhoun County Airport",
         "city": "Blountstown",
@@ -127583,8 +127583,8 @@
         "lon": -16.3414993286,
         "tz": "Atlantic/Canary"
     },
-    "GDK": {
-        "icao": "GDK",
+    "KGDK": {
+        "icao": "KGDK",
         "iata": "",
         "name": "Greene County\u2013Lewis A. Jackson Regional Airport",
         "city": "Xenia",
@@ -129203,8 +129203,8 @@
         "lon": -25.0552997589,
         "tz": "Atlantic/Cape_Verde"
     },
-    "H47": {
-        "icao": "H47",
+    "KH47": {
+        "icao": "KH47",
         "iata": "",
         "name": "Hyampom Airport",
         "city": "Hyampom",
@@ -129215,8 +129215,8 @@
         "lon": -123.4685,
         "tz": "America/Los_Angeles"
     },
-    "H81": {
-        "icao": "H81",
+    "KH81": {
+        "icao": "KH81",
         "iata": "",
         "name": "River Falls Airport",
         "city": "Amarillo",
@@ -133451,8 +133451,8 @@
         "lon": 34.1669998169,
         "tz": "Africa/Kampala"
     },
-    "I42": {
-        "icao": "I42",
+    "KI42": {
+        "icao": "KI42",
         "iata": "",
         "name": "Paoli Municipal Airport",
         "city": "Paoli",
@@ -133463,8 +133463,8 @@
         "lon": -86.46494833,
         "tz": "America/Indiana/Indianapolis"
     },
-    "I44": {
-        "icao": "I44",
+    "KI44": {
+        "icao": "KI44",
         "iata": "",
         "name": "Dahio Trotwood Airport",
         "city": "Dayton",
@@ -133475,8 +133475,8 @@
         "lon": -84.34296111,
         "tz": "America/New_York"
     },
-    "I83": {
-        "icao": "I83",
+    "KI83": {
+        "icao": "KI83",
         "iata": "",
         "name": "Salem Municipal Airport",
         "city": "Salem",
@@ -133487,8 +133487,8 @@
         "lon": -86.15225161,
         "tz": "America/Indiana/Indianapolis"
     },
-    "I96": {
-        "icao": "I96",
+    "KI96": {
+        "icao": "KI96",
         "iata": "",
         "name": "Columbia-Adair County Airport",
         "city": "Columbia",
@@ -133499,8 +133499,8 @@
         "lon": -85.34718444,
         "tz": "America/Chicago"
     },
-    "I99": {
-        "icao": "I99",
+    "KI99": {
+        "icao": "KI99",
         "iata": "",
         "name": "Alexandria Airport",
         "city": "Alexandria",
@@ -138323,8 +138323,8 @@
         "lon": -95.0178985596,
         "tz": "America/Chicago"
     },
-    "K01": {
-        "icao": "K01",
+    "KK01": {
+        "icao": "KK01",
         "iata": "",
         "name": "Farington Field",
         "city": "Auburn",
@@ -139571,8 +139571,8 @@
         "lon": -94.8739013672,
         "tz": "America/Chicago"
     },
-    "K15": {
-        "icao": "K15",
+    "KK15": {
+        "icao": "KK15",
         "iata": "",
         "name": "Grand Glaize-Osage Beach Airport",
         "city": "Osage Beach, Missouri",
@@ -139655,8 +139655,8 @@
         "lon": -84.4192962646,
         "tz": "America/New_York"
     },
-    "K17": {
-        "icao": "K17",
+    "KK17": {
+        "icao": "KK17",
         "iata": "",
         "name": "Montezuma Municipal Airport",
         "city": "Montezuma",
@@ -140927,8 +140927,8 @@
         "lon": -89.0150985718,
         "tz": "America/Chicago"
     },
-    "K26": {
-        "icao": "K26",
+    "KK26": {
+        "icao": "KK26",
         "iata": "",
         "name": "Carrollton Memorial Airport",
         "city": "Carrollton",
@@ -141947,8 +141947,8 @@
         "lon": -106.2710037231,
         "tz": "America/Denver"
     },
-    "K34": {
-        "icao": "K34",
+    "KK34": {
+        "icao": "KK34",
         "iata": "",
         "name": "Gardner Municipal Airport",
         "city": "Gardner",
@@ -143231,8 +143231,8 @@
         "lon": -101.5469970703,
         "tz": "America/Denver"
     },
-    "K43": {
-        "icao": "K43",
+    "KK43": {
+        "icao": "KK43",
         "iata": "",
         "name": "Unionville Municipal Airport",
         "city": "Unionville",
@@ -145223,8 +145223,8 @@
         "lon": -98.8460998535,
         "tz": "America/Chicago"
     },
-    "K68": {
-        "icao": "K68",
+    "KK68": {
+        "icao": "KK68",
         "iata": "",
         "name": "Garnett Municipal Airport",
         "city": "Garnett",
@@ -181847,8 +181847,8 @@
         "lon": -102.141998291,
         "tz": "America/Chicago"
     },
-    "KY8": {
-        "icao": "KY8",
+    "KKY8": {
+        "icao": "KKY8",
         "iata": "",
         "name": "Hancock County/Ron Lewis Field",
         "city": "Lewisport",
@@ -182063,8 +182063,8 @@
         "lon": -81.8920974731,
         "tz": "America/New_York"
     },
-    "L36": {
-        "icao": "L36",
+    "KL36": {
+        "icao": "KL36",
         "iata": "",
         "name": "Rio Linda Airport",
         "city": "Rio Linda",
@@ -182075,8 +182075,8 @@
         "lon": -121.44544444,
         "tz": "America/Los_Angeles"
     },
-    "L78": {
-        "icao": "L78",
+    "KL78": {
+        "icao": "KL78",
         "iata": "",
         "name": "Jacumba Airport",
         "city": "Jacumba",
@@ -182087,8 +182087,8 @@
         "lon": -116.16553888,
         "tz": "America/Los_Angeles"
     },
-    "L92": {
-        "icao": "L92",
+    "KL92": {
+        "icao": "KL92",
         "iata": "",
         "name": "Alamo Landing Field",
         "city": "Alamo",
@@ -199979,8 +199979,8 @@
         "lon": 18.6135005951,
         "tz": "Europe/Bratislava"
     },
-    "M10": {
-        "icao": "M10",
+    "KM10": {
+        "icao": "KM10",
         "iata": "",
         "name": "Mountainair Municipal Airport",
         "city": "Mountainair",
@@ -199991,8 +199991,8 @@
         "lon": -106.22388888,
         "tz": "America/Denver"
     },
-    "M95": {
-        "icao": "M95",
+    "KM95": {
+        "icao": "KM95",
         "iata": "",
         "name": "Richard Arthur Field",
         "city": "Fayette",
@@ -208091,8 +208091,8 @@
         "lon": -94.5766983032,
         "tz": "America/Chicago"
     },
-    "MO5": {
-        "icao": "MO5",
+    "KMO5": {
+        "icao": "KMO5",
         "iata": "",
         "name": "Bollinger-Crass Memorial Airport",
         "city": "Van Buren",
@@ -214955,8 +214955,8 @@
         "lon": -88.3081970215,
         "tz": "America/Belize"
     },
-    "N15": {
-        "icao": "N15",
+    "KN15": {
+        "icao": "KN15",
         "iata": "",
         "name": "Kingston Airport",
         "city": "Kingston",
@@ -214967,8 +214967,8 @@
         "lon": -117.06893436,
         "tz": "America/Los_Angeles"
     },
-    "N17": {
-        "icao": "N17",
+    "KN17": {
+        "icao": "KN17",
         "iata": "",
         "name": "Vaughn Municipal Airport",
         "city": "Vaughn",
@@ -214979,8 +214979,8 @@
         "lon": -105.19182194,
         "tz": "America/Denver"
     },
-    "N30": {
-        "icao": "N30",
+    "KN30": {
+        "icao": "KN30",
         "iata": "",
         "name": "Cherry Ridge Airport",
         "city": "Honesdale",
@@ -214991,8 +214991,8 @@
         "lon": -75.25155972,
         "tz": "America/New_York"
     },
-    "N45": {
-        "icao": "N45",
+    "KN45": {
+        "icao": "KN45",
         "iata": "",
         "name": "Kobelt Airport",
         "city": "Wallkill",
@@ -215003,8 +215003,8 @@
         "lon": -74.14166666,
         "tz": "America/New_York"
     },
-    "N85": {
-        "icao": "N85",
+    "KN85": {
+        "icao": "KN85",
         "iata": "",
         "name": "Alexandria Airport",
         "city": "Pittstown",
@@ -215015,8 +215015,8 @@
         "lon": -75.01942055,
         "tz": "America/New_York"
     },
-    "N87": {
-        "icao": "N87",
+    "KN87": {
+        "icao": "KN87",
         "iata": "",
         "name": "Trenton-Robbinsville Airport",
         "city": "Robbinsville",
@@ -215027,8 +215027,8 @@
         "lon": -74.60177777,
         "tz": "America/New_York"
     },
-    "N89": {
-        "icao": "N89",
+    "KN89": {
+        "icao": "KN89",
         "iata": "",
         "name": "Joseph Y. Resnick Airport",
         "city": "Ellenville",
@@ -224543,8 +224543,8 @@
         "lon": 176.5370025635,
         "tz": "Pacific/Auckland"
     },
-    "O24": {
-        "icao": "O24",
+    "KO24": {
+        "icao": "KO24",
         "iata": "",
         "name": "Lee Vining Airport",
         "city": "Lee Vining",
@@ -224555,8 +224555,8 @@
         "lon": -119.10581116,
         "tz": "America/Los_Angeles"
     },
-    "O33": {
-        "icao": "O33",
+    "KO33": {
+        "icao": "KO33",
         "iata": "",
         "name": "Samoa Field",
         "city": "Eureka",
@@ -224567,8 +224567,8 @@
         "lon": -124.21227777,
         "tz": "America/Los_Angeles"
     },
-    "O45": {
-        "icao": "O45",
+    "KO45": {
+        "icao": "KO45",
         "iata": "",
         "name": "Hooker Municipal Airport",
         "city": "Hooker",
@@ -224579,8 +224579,8 @@
         "lon": -101.22709166,
         "tz": "America/Chicago"
     },
-    "O60": {
-        "icao": "O60",
+    "KO60": {
+        "icao": "KO60",
         "iata": "",
         "name": "Cloverdale Municipal Airport",
         "city": "Cloverdale",
@@ -233639,8 +233639,8 @@
         "lon": 44.783000946,
         "tz": "Asia/Aden"
     },
-    "P34": {
-        "icao": "P34",
+    "KP34": {
+        "icao": "KP34",
         "iata": "",
         "name": "Mifflintown Airport",
         "city": "Mifflintown",
@@ -237935,8 +237935,8 @@
         "lon": -80.3581008911,
         "tz": "America/New_York"
     },
-    "PO1": {
-        "icao": "PO1",
+    "KPO1": {
+        "icao": "KPO1",
         "iata": "",
         "name": "Poplar Municipal Airport",
         "city": "Poplar",
@@ -242567,8 +242567,8 @@
         "lon": 119.416,
         "tz": "Asia/Manila"
     },
-    "S28": {
-        "icao": "S28",
+    "KS28": {
+        "icao": "KS28",
         "iata": "",
         "name": "International Peace Garden Airport",
         "city": "Dunseith",
@@ -242579,8 +242579,8 @@
         "lon": -100.04369444,
         "tz": "America/Chicago"
     },
-    "S30": {
-        "icao": "S30",
+    "KS30": {
+        "icao": "KS30",
         "iata": "",
         "name": "Lebanon State Airport",
         "city": "Lebanon",
@@ -242591,8 +242591,8 @@
         "lon": -122.92972222,
         "tz": "America/Los_Angeles"
     },
-    "S31": {
-        "icao": "S31",
+    "KS31": {
+        "icao": "KS31",
         "iata": "",
         "name": "Lopez Island Airport",
         "city": "Lopez",
@@ -242603,8 +242603,8 @@
         "lon": -122.93766666,
         "tz": "America/Los_Angeles"
     },
-    "S37": {
-        "icao": "S37",
+    "KS37": {
+        "icao": "KS37",
         "iata": "",
         "name": "Smoketown Airport",
         "city": "Smoketown",
@@ -242615,8 +242615,8 @@
         "lon": -76.20189583,
         "tz": "America/New_York"
     },
-    "S49": {
-        "icao": "S49",
+    "KS49": {
+        "icao": "KS49",
         "iata": "",
         "name": "Miller Memorial Airpark",
         "city": "Vale",
@@ -242627,8 +242627,8 @@
         "lon": -117.2593425,
         "tz": "America/Boise"
     },
-    "S66": {
-        "icao": "S66",
+    "KS66": {
+        "icao": "KS66",
         "iata": "",
         "name": "Homedale Municipal Airport",
         "city": "Homedale",
@@ -242639,8 +242639,8 @@
         "lon": -116.92136111,
         "tz": "America/Boise"
     },
-    "S68": {
-        "icao": "S68",
+    "KS68": {
+        "icao": "KS68",
         "iata": "",
         "name": "Orofino Municipal Airport",
         "city": "Orofino",
@@ -242651,8 +242651,8 @@
         "lon": -116.27539944,
         "tz": "America/Los_Angeles"
     },
-    "S89": {
-        "icao": "S89",
+    "KS89": {
+        "icao": "KS89",
         "iata": "",
         "name": "Craigmont Municipal Airport",
         "city": "Craigmont",
@@ -257987,8 +257987,8 @@
         "lon": -56.6300010681,
         "tz": "America/Asuncion"
     },
-    "SH1": {
-        "icao": "SH1",
+    "KSH1": {
+        "icao": "KSH1",
         "iata": "",
         "name": "Shelby Auxiliary Field One",
         "city": "Camp Shelby",
@@ -298631,8 +298631,8 @@
         "lon": -59.5332984924,
         "tz": "America/Guyana"
     },
-    "T37": {
-        "icao": "T37",
+    "KT37": {
+        "icao": "KT37",
         "iata": "",
         "name": "Goldthwaite Municipal Airport",
         "city": "Goldthwaite",
@@ -298643,8 +298643,8 @@
         "lon": -98.60835555,
         "tz": "America/Chicago"
     },
-    "T71": {
-        "icao": "T71",
+    "KT71": {
+        "icao": "KT71",
         "iata": "",
         "name": "Cuero Municipal Airport",
         "city": "Cuero",
@@ -298655,8 +298655,8 @@
         "lon": -97.26693416,
         "tz": "America/Chicago"
     },
-    "T73": {
-        "icao": "T73",
+    "KT73": {
+        "icao": "KT73",
         "iata": "",
         "name": "Kirk Air Base",
         "city": "Lancaster",
@@ -302087,8 +302087,8 @@
         "lon": -96.3069000244,
         "tz": "America/Chicago"
     },
-    "TSG": {
-        "icao": "TSG",
+    "KTSG": {
+        "icao": "KTSG",
         "iata": "",
         "name": "Tanacross Airport",
         "city": "Tanacross",
@@ -302243,8 +302243,8 @@
         "lon": -61.210899353,
         "tz": "America/St_Vincent"
     },
-    "TX0": {
-        "icao": "TX0",
+    "KTX0": {
+        "icao": "KTX0",
         "iata": "",
         "name": "Shank N Bank Airport",
         "city": "La Ward",
@@ -302411,8 +302411,8 @@
         "lon": -94.9072036743,
         "tz": "America/Chicago"
     },
-    "TX2": {
-        "icao": "TX2",
+    "KTX2": {
+        "icao": "KTX2",
         "iata": "",
         "name": "Chase Field Industrial Airport",
         "city": "Beeville",
@@ -303095,8 +303095,8 @@
         "lon": -64.6787033081,
         "tz": "Atlantic/Bermuda"
     },
-    "U94": {
-        "icao": "U94",
+    "KU94": {
+        "icao": "KU94",
         "iata": "",
         "name": "Hazelton Municipal Airport",
         "city": "Hazelton",
@@ -318455,8 +318455,8 @@
         "lon": 96.1332015991,
         "tz": "Asia/Yangon"
     },
-    "W04": {
-        "icao": "W04",
+    "KW04": {
+        "icao": "KW04",
         "iata": "",
         "name": "Ocean Shores Municipal Airport",
         "city": "Ocean Shores",
@@ -318467,8 +318467,8 @@
         "lon": -124.1423825,
         "tz": "America/Los_Angeles"
     },
-    "W11": {
-        "icao": "W11",
+    "KW11": {
+        "icao": "KW11",
         "iata": "",
         "name": "Sullivan Airport",
         "city": "Sullivan",
@@ -318479,8 +318479,8 @@
         "lon": -88.6019973755,
         "tz": "America/Chicago"
     },
-    "W20": {
-        "icao": "W20",
+    "KW20": {
+        "icao": "KW20",
         "iata": "",
         "name": "Moses Lake Municipal Airport",
         "city": "Moses Lake",
@@ -318491,8 +318491,8 @@
         "lon": -119.23788194,
         "tz": "America/Los_Angeles"
     },
-    "W24": {
-        "icao": "W24",
+    "KW24": {
+        "icao": "KW24",
         "iata": "",
         "name": "Falwell Airport",
         "city": "Lynchburg",
@@ -318503,8 +318503,8 @@
         "lon": -79.12224527,
         "tz": "America/New_York"
     },
-    "W29": {
-        "icao": "W29",
+    "KW29": {
+        "icao": "KW29",
         "iata": "",
         "name": "Bay Bridge Airport",
         "city": "Stevensville",
@@ -318515,8 +318515,8 @@
         "lon": -76.32996911,
         "tz": "America/New_York"
     },
-    "W48": {
-        "icao": "W48",
+    "KW48": {
+        "icao": "KW48",
         "iata": "",
         "name": "Essex Skypark",
         "city": "Baltimore",
@@ -318527,8 +318527,8 @@
         "lon": -76.432125,
         "tz": "America/New_York"
     },
-    "W73": {
-        "icao": "W73",
+    "KW73": {
+        "icao": "KW73",
         "iata": "",
         "name": "Mid Atlantic Soaring Center",
         "city": "Fairfield",
@@ -318539,8 +318539,8 @@
         "lon": -77.35137611,
         "tz": "America/New_York"
     },
-    "W99": {
-        "icao": "W99",
+    "KW99": {
+        "icao": "KW99",
         "iata": "PGC",
         "name": "Grant County Airport",
         "city": "Petersburg",
@@ -326579,8 +326579,8 @@
         "lon": -105.6200027466,
         "tz": "America/Denver"
     },
-    "X14": {
-        "icao": "X14",
+    "KX14": {
+        "icao": "KX14",
         "iata": "",
         "name": "La Belle Municipal Airport",
         "city": "La Belle",
@@ -326591,8 +326591,8 @@
         "lon": -81.42827777,
         "tz": "America/New_York"
     },
-    "X23": {
-        "icao": "X23",
+    "KX23": {
+        "icao": "KX23",
         "iata": "",
         "name": "Umatilla Municipal Airport",
         "city": "Umatilla",
@@ -326603,8 +326603,8 @@
         "lon": -81.65178111,
         "tz": "America/New_York"
     },
-    "X33": {
-        "icao": "X33",
+    "KX33": {
+        "icao": "KX33",
         "iata": "",
         "name": "Doniphan Municipal Airport",
         "city": "Doniphan",
@@ -326615,8 +326615,8 @@
         "lon": -90.78447222,
         "tz": "America/Chicago"
     },
-    "X35": {
-        "icao": "X35",
+    "KX35": {
+        "icao": "KX35",
         "iata": "",
         "name": "Marion County Airport",
         "city": "Dunnellon",
@@ -326627,8 +326627,8 @@
         "lon": -82.37661944,
         "tz": "America/New_York"
     },
-    "X51": {
-        "icao": "X51",
+    "KX51": {
+        "icao": "KX51",
         "iata": "",
         "name": "Miami Homestead General Aviation Airport",
         "city": "Homestead",
@@ -328415,8 +328415,8 @@
         "lon": 46.2,
         "tz": "Europe/Saratov"
     },
-    "Y49": {
-        "icao": "Y49",
+    "KY49": {
+        "icao": "KY49",
         "iata": "",
         "name": "Walker Municipal Airport",
         "city": "Walker",
@@ -328427,8 +328427,8 @@
         "lon": -94.64534669,
         "tz": "America/Chicago"
     },
-    "Y63": {
-        "icao": "Y63",
+    "KY63": {
+        "icao": "KY63",
         "iata": "",
         "name": "Elbow Lake Municipal Airport/Pride Of The Prairie",
         "city": "Elbow Lake",
@@ -328439,8 +328439,8 @@
         "lon": -95.98575,
         "tz": "America/Chicago"
     },
-    "Y87": {
-        "icao": "Y87",
+    "KY87": {
+        "icao": "KY87",
         "iata": "",
         "name": "Empire Airport",
         "city": "Empire",
@@ -347795,8 +347795,8 @@
         "lon": -57.1500015259,
         "tz": "America/Asuncion"
     },
-    "Z99": {
-        "icao": "Z99",
+    "KZ99": {
+        "icao": "KZ99",
         "iata": "",
         "name": "Mettie Airstrip",
         "city": "Yakima",