diff --git a/airports.csv b/airports.csv
index 58485a324..ec1c247ab 100644
--- a/airports.csv
+++ b/airports.csv
@@ -6866,7 +6866,7 @@
 12522,"5MS5","small_airport","Mint Julep Airpark",30.54520034790039,-89.46279907226562,100,"NA","US","US-MS","Picayune","no","5MS5",,"5MS5",,,
 12523,"5MS6","small_airport","Dee's Strip",32.42300033569336,-90.00769805908203,329,"NA","US","US-MS","Brandon","no","5MS6",,"5MS6",,,
 45493,"5MS7","heliport","Baptist Memorial Hospital Union County Heliport",34.4975,-89.026389,415,"NA","US","US-MS","New Albany","no","5MS7",,"5MS7",,,
-45492,"5MS8","small_airport","Ball Airport",33.875,-88.723333,298,"NA","US","US-MS","Okolona","no","5MS8",,"5MS8",,,
+45492,"5MS8","small_airport","Ball Airport",33.872614,-88.724012,298,"NA","US","US-MS","Okolona","no","5MS8",,"5MS8",,,
 45496,"5MS9","heliport","Penton Heliport",30.59905,-89.541717,167,"NA","US","US-MS","Picayune","no",,,,,,"5MS9"
 330691,"5MT5","small_airport","Unrau Airport",48.448504,-105.830899,2900,"NA","US","US-MT","Wolf Point","no","5MT5",,"5MT5",,,
 342445,"5MU5","small_airport","Gjerde International Airport",38.508979,-94.484349,905,"NA","US","US-MO","Drexel","no","5MU5",,"5MU5",,,
@@ -12714,7 +12714,7 @@
 334120,"AU-0166","heliport","Poitrel Mine Helicopter Landing Site",-22.039842,148.261292,772,"OC","AU","AU-QLD","Moranbah","no",,,"OZHAU",,,
 334121,"AU-0167","heliport","Charlotte Pass Medical Centre HLS",-36.434153,148.333417,5752,"OC","AU","AU-NSW","Charlotte Pass","no",,,"OZHBF",,,
 335456,"AU-0168","heliport","Batemans Bay ALT Hanging Rock HLS",-35.721,150.1955,39,"OC","AU","AU-NSW","Batemans Bay","no",,,"OZHJV",,,
-335457,"AU-0169","heliport","Batemans Bay Mackay Park HLS",-35.708915,150.172621,46,"OC","AU","AU-NSW","Batemans Bay","no",,,"OZHJU",,,
+335457,"AU-0169","heliport","Batemans Bay Mackay Park HLS",-35.708333,150.1725,46,"OC","AU","AU-NSW","Batemans Bay","no",,,"OZHJU",,,
 335461,"AU-0170","heliport","Bathurst Hospital Alternate (Victoria Park) Helipad",-33.407196,149.574115,2160,"OC","AU","AU-NSW","Bathurst","no",,,"OZHJF",,,
 335463,"AU-0171","heliport","Cabramurra Helicopter Landing Site",-35.939833,148.377333,4900,"OC","AU","AU-NSW","Cabramurra","no",,,"OZHIA",,,
 335464,"AU-0172","heliport","Cadia Mine(Ridgeway) Helicopter Landing Site",-33.44435,149.000842,2650,"OC","AU","AU-NSW","Cadia Mine","no",,,"OZHDJ",,,
@@ -13196,6 +13196,7 @@
 531564,"AU-0648","small_airport","Mount Moffatt Airstrip",-25.041314,147.937575,2323,"OC","AU","AU-QLD","Carnarvon National Park","no",,,,,,
 533218,"AU-0649","small_airport","Albro Station Airstrip",-22.709174,146.566501,848,"OC","AU","AU-QLD","Laglan","no",,,,,,
 538421,"AU-0650","small_airport","Bunurong Field",-38.621701,145.668969,,"OC","AU","AU-VIC","Inverloch","no",,,,,,
+538739,"AU-0651","heliport","Batemans Bay District Hospital Helipad",-35.7141,150.182194,75,"OC","AU","AU-NSW","Batemans Bay","no",,,,,,"YXBM"
 30622,"AU-AGW","small_airport","Agnew Airport",-12.1456,142.149369,160,"OC","AU","AU-QLD","Agnew","no","YAGN","AGW",,,"https://en.wikipedia.org/wiki/Agnew_Airport",
 30666,"AU-AYD","small_airport","Alroy Downs Airport",-19.2908,136.078995,711,"OC","AU","AU-NT","Alroy Downs","no","YALD","AYD",,,,
 30808,"AU-BYX","small_airport","Baniyala Airport",-13.1981,136.227005,20,"OC","AU","AU-NT","Baniyala","no","YBNI","BYX",,,,
@@ -20506,7 +20507,7 @@
 1820,"CYMX","medium_airport","Montreal International (Mirabel) Airport",45.679501,-74.038696,270,"NA","CA","CA-QC","Montréal","no","CYMX","YMX",,,"https://en.wikipedia.org/wiki/Montr%C3%A9al-Mirabel_International_Airport","YMQ"
 1821,"CYMY","small_airport","Ear Falls Airport",50.71780014038086,-93.38359832763672,1269,"NA","CA","CA-ON","Ear Falls","no","CYMY",,,,"https://en.wikipedia.org/wiki/Ear_Falls_Airport","YMY"
 320826,"CYN6","seaplane_base","Gravenhurst/Muskoka Bay Seaplane Base",44.9438,-79.4045,742,"NA","CA","CA-ON","Gravenhurst","no","CYN6",,"CYN6",,"https://en.wikipedia.org/wiki/Gravenhurst/Muskoka_Bay_Water_Aerodrome",
-1822,"CYNA","medium_airport","Natashquan Airport",50.189998626708984,-61.78919982910156,39,"NA","CA","CA-QC","Natashquan","yes","CYNA","YNA",,,"https://en.wikipedia.org/wiki/Natashquan_Airport",
+1822,"CYNA","medium_airport","Natashquan Airport",50.190114,-61.78898,39,"NA","CA","CA-QC","Natashquan","yes","CYNA","YNA",,,"https://en.wikipedia.org/wiki/Natashquan_Airport",
 1823,"CYNC","small_airport","Wemindji Airport",53.010601,-78.8311,66,"NA","CA","CA-QC","Wemindji","yes","CYNC","YNC",,,"https://en.wikipedia.org/wiki/Wemindji_Airport",
 1824,"CYND","medium_airport","Ottawa / Gatineau Airport",45.521702,-75.563599,211,"NA","CA","CA-QC","Gatineau","yes","CYND","YND","CYND","http://www.ego-airport.ca/english/propos_ego/","https://en.wikipedia.org/wiki/Ottawa-Gatineau_Airport","YND"
 1825,"CYNE","small_airport","Norway House Airport",53.958302,-97.8442,734,"NA","CA","CA-MB","Norway House","yes","CYNE","YNE",,,"https://en.wikipedia.org/wiki/Norway_House_Airport",
@@ -23004,7 +23005,7 @@
 538408,"EEAE","small_airport","Aespa Airfield",59.204711,24.610995,196,"EU","EE","EE-37","Aespa","no","EEAE",,,,,
 342467,"EEB","small_airport","El Espino Airport",6.4884,-72.50388,7126,"SA","CO","CO-BOY","El Espino","no",,,"EEB",,,"SQSY"
 43020,"EECL","heliport","Tallinn Linnahall Heliport",59.448015,24.753313,23,"EU","EE","EE-37","Tallinn","yes","EECL",,,,"https://en.wikipedia.org/wiki/Tallinn_Linnahall_Heliport","Tallinn City Hall"
-2297,"EEEI","medium_airport","Ämari Air Base",59.26029968261719,24.208499908447266,65,"EU","EE","EE-37","Keila","no","EEEI",,,,"https://en.wikipedia.org/wiki/%C3%84mari_Air_Base","Suurküla, Vasalemma, Emari, Suurkyul, Shuurkyul, Shuurkul"
+2297,"EEEI","medium_airport","Ämari Air Base",59.259599,24.204799,65,"EU","EE","EE-37","Keila","no","EEEI",,,,"https://en.wikipedia.org/wiki/%C3%84mari_Air_Base","Suurküla, Vasalemma, Emari, Suurkyul, Shuurkyul, Shuurkul"
 308836,"EEHA","small_airport","Humala Airfield",59.3579,24.3795,88,"EU","EE","EE-37","Humala","no","EEHA",,,,"https://en.wikipedia.org/wiki/Humala_Airfield",
 538411,"EEHK","heliport","Vanamõisa Heliport",59.333491,24.55924,,"EU","EE","EE-37","Vanamõisa","no","EEHK",,,,,
 538410,"EEHV","heliport","Tabasalu Heliport",59.450342,24.602228,,"EU","EE","EE-37","Tabasalu","no","EEHV",,,,,
@@ -26337,7 +26338,7 @@
 326702,"FR-0371","small_airport","Fromissard ULM",44.003856,1.229357,,"EU","FR","FR-OCC",,"no",,,"LF8234",,,
 328585,"FR-0372","heliport","Ile du Levant Helicopter Base",43.021514,6.460228,,"EU","FR","FR-PAC",,"no",,,,,,
 329036,"FR-0373","closed","Base ULM de Meyrargues",43.6527318,5.5252254,,"EU","FR","FR-PAC",,"no",,,,,,
-329110,"FR-0374","small_airport","Corbonod-Seyssel Private Airport",45.9618,5.8178,1175,"EU","FR","FR-ARA","Corbonod, Ain","no",,,"LF0151",,,
+329110,"FR-0374","small_airport","Corbonod-Seyssel Private Airfield",45.9618,5.8178,1175,"EU","FR","FR-ARA","Corbonod, Ain","no",,,"LF0151",,,
 329117,"FR-0375","heliport","Mont Blanc Hélicoptères",45.57524,6.83133,,"EU","FR","FR-ARA",,"no",,,,,,
 329129,"FR-0376","closed","Aerodrome d'Esperce",43.316192,1.404468,,"EU","FR","FR-OCC",,"no",,,,,,
 329135,"FR-0377","closed","Laon-Couvron Air Base",49.63048,3.54344,,"EU","FR","FR-HDF","Vivaise, Aisne","no",,,,,"https://fr.wikipedia.org/wiki/Base_a%C3%A9rienne_de_Laon-Couvron",
@@ -36447,7 +36448,7 @@
 18702,"K3HO","small_airport","Hobart Sky Ranch Airport",41.55419921875,-87.26249694824219,644,"NA","US","US-IN","Hobart","no","K3HO",,"3HO",,"https://en.wikipedia.org/wiki/Hobart_Sky_Ranch_Airport",
 18703,"K3I2","small_airport","Mason County Airport",38.9146,-82.098602,643,"NA","US","US-WV","Point Pleasant","no","K3I2",,"3I2",,"https://en.wikipedia.org/wiki/Mason_County_Airport_(West_Virginia)",
 18704,"K3I3","small_airport","Sky King Airport",39.547223,-87.378623,496,"NA","US","US-IN","Terre Haute","no","K3I3",,"3I3",,"https://en.wikipedia.org/wiki/Sky_King_Airport",
-18705,"K3I4","small_airport","Richwood Municipal Airport",38.258399963378906,-80.65070343017578,2486,"NA","US","US-WV","Richwood","no","K3I4",,"3I4",,,
+18705,"K3I4","small_airport","Richwood Municipal Airport",38.258351,-80.650783,2486,"NA","US","US-WV","Richwood","no","K3I4",,"3I4",,,
 18706,"K3I7","small_airport","Dayton-Phillipsburg Airport",39.913305,-84.400398,1031,"NA","US","US-OH","Phillipsburg","no",,,"3I7",,,
 18707,"K3J0","small_airport","Hampton County Airport",32.8665,-81.081001,113,"NA","US","US-SC","Hampton","no",,,"3J0",,,"Hampton Varnville"
 18708,"K3J1","small_airport","Ridgeland-Claude Dean Airport",32.492699,-80.992302,79,"NA","US","US-SC","Ridgeland","no","K3J1",,"3J1",,"https://en.wikipedia.org/wiki/Ridgeland_Airport","Ridgeland Airport"
@@ -36621,7 +36622,7 @@
 18888,"K57S","small_airport","Troy Airport",48.480202,-115.903999,2017,"NA","US","US-MT","Troy","no","K57S",,"57S",,"https://en.wikipedia.org/wiki/Troy_Airport",
 18889,"K58M","small_airport","Cecil County Airport",39.5742,-75.869797,106,"NA","US","US-MD","Elkton","no","K58M",,"58M",,"https://en.wikipedia.org/wiki/Claremont_Airport_(Maryland)",
 18890,"K5A1","small_airport","Norwalk Huron County Airport",41.244801,-82.551201,852,"NA","US","US-OH","Norwalk","no","K5A1",,"5A1",,"https://en.wikipedia.org/wiki/Norwalk-Huron_County_Airport",
-18891,"K5A4","small_airport","Okolona Municipal-Richard Stovall Field",34.015800476100004,-88.7261962891,335,"NA","US","US-MS","Okolona","no","K5A4",,"5A4",,,
+18891,"K5A4","small_airport","Okolona Municipal Airport Richard Stovall Field",34.0158,-88.726196,335,"NA","US","US-MS","Okolona","no","K5A4",,"5A4",,,
 18892,"K5A6","small_airport","Winona–Montgomery County Airport",33.4654007,-89.72920227,364,"NA","US","US-MS","Winona","no","5A6",,"5A6",,"https://en.wikipedia.org/wiki/Winona-Montgomery_County_Airport",
 18893,"K5A9","small_airport","Roosevelt Memorial Airport",32.937904,-84.696467,880,"NA","US","US-GA","Woodbury","no","K5A9",,"5A9",,,
 18894,"K5B2","small_airport","Saratoga County Airport",43.0513,-73.861198,434,"NA","US","US-NY","Saratoga Springs","no","K5B2",,"5B2",,"https://en.wikipedia.org/wiki/Saratoga_County_Airport",
@@ -37968,7 +37969,7 @@
 19731,"KEFD","medium_airport","Ellington Airport",29.607299804700002,-95.1587982178,32,"NA","US","US-TX","Houston","no","KEFD","EFD","EFD",,"https://en.wikipedia.org/wiki/Ellington_Airport_(Texas)","Ellington Field"
 19732,"KEFK","small_airport","Northeast Kingdom International Airport",44.888802,-72.229202,930,"NA","US","US-VT","Newport","no","KEFK","EFK","EFK",,"https://en.wikipedia.org/wiki/Newport_State_Airport_(Vermont)","Newport State Airport"
 19733,"KEFT","small_airport","Monroe Municipal Airport",42.614899,-89.590401,1086,"NA","US","US-WI","Monroe","no","KEFT",,"EFT",,"https://en.wikipedia.org/wiki/Monroe_Municipal_Airport",
-19734,"KEFW","small_airport","Jefferson Municipal Airport",42.009866,-94.341717,1044,"NA","US","US-IA","Jefferson","no","KEFW","EFW","EFW","http://cityofjeffersoniowa.org/depts-airport.php",,"Don Monthei Airfield"
+19734,"KEFW","small_airport","Jefferson Municipal Airport",42.009866,-94.341717,1044,"NA","US","US-IA","Jefferson","no","KEFW","EFW","EFW","https://cityofjeffersoniowa.org/city-departments/airport/",,"Don Monthei Airfield"
 307905,"KEG","small_airport","Keglsugl Airport",-5.83277777778,145.097222222,8400,"OC","PG","PG-CPK","Denglagu Mission","no","AYLG","KEG","KEG",,,
 3505,"KEGE","medium_airport","Eagle County Regional Airport",39.64260101,-106.9179993,6548,"NA","US","US-CO","Eagle","yes","KEGE","EGE","EGE","http://www.eaglecounty.us/airport/","https://en.wikipedia.org/wiki/Eagle_County_Regional_Airport",
 19735,"KEGI","medium_airport","Duke Field",30.65040016,-86.52290344,191,"NA","US","US-FL","Crestview","no","KEGI","EGI","EGI","http://www.919sow.afrc.af.mil/","https://en.wikipedia.org/wiki/Duke_Field","Eglin AF Auxiliary Number 3"
@@ -38705,7 +38706,7 @@
 20263,"KK77","small_airport","Freedom Municipal Airport",36.758433,-99.102369,1517,"NA","US","US-OK","Freedom","no","KK77",,"K77",,,
 20265,"KK79","small_airport","Jetmore Municipal Airport",37.984501,-99.894302,2466,"NA","US","US-KS","Jetmore","no","KK79",,"K79",,"https://en.wikipedia.org/wiki/Jetmore_Municipal_Airport",
 20266,"KK81","small_airport","Miami County Airport",38.53971,-94.920517,940,"NA","US","US-KS","Paola","no","KK81",,"K81",,"https://en.wikipedia.org/wiki/Miami_County_Airport","Osawatomie-Paola Municipal Airport"
-20267,"KK82","small_airport","Smith Center Municipal Airport",39.76110076904297,-98.79340362548828,1799,"NA","US","US-KS","Smith Center","no","KK82",,"K82",,,
+20267,"KK82","small_airport","Smith Center Municipal Airport",39.76236,-98.794493,1800,"NA","US","US-KS","Smith Center","no","KK82",,"K82",,,
 20268,"KK83","small_airport","Sabetha Municipal Airport",39.905962,-95.776263,1330,"NA","US","US-KS","Sabetha","no","K83",,"K83",,,"Sabetha Municipal Landing Field"
 20269,"KK88","small_airport","Allen County Airport",37.870098,-95.386398,1015,"NA","US","US-KS","Iola","no","KK88",,"K88",,"https://en.wikipedia.org/wiki/Allen_County_Airport",
 20270,"KK89","small_airport","Macon Fowler Memorial Airport",39.728699,-92.4645,874,"NA","US","US-MO","Macon","no","KK89",,"K89",,,
@@ -38894,7 +38895,7 @@
 20414,"KM18","small_airport","Hope Municipal Airport",33.7201,-93.658798,359,"NA","US","US-AR","Hope","no","KM18",,"M18",,"https://en.wikipedia.org/wiki/Hope_Municipal_Airport",
 20415,"KM19","small_airport","Newport Regional Airport",35.637699,-91.176397,239,"NA","US","US-AR","Newport","no",,,"M19","http://newportarcity.org/home/city-departments/airport/","https://en.wikipedia.org/wiki/Newport_Municipal_Airport_(Arkansas)","Newport Municipal"
 20416,"KM20","small_airport","Grayson County Airport",37.39950180053711,-86.26020050048828,760,"NA","US","US-KY","Leitchfield","no","KM20",,"M20",,,
-20417,"KM21","small_airport","Muhlenberg County Airport",37.225966,-87.156987,422,"NA","US","US-KY","Greenville","no","M21",,"M21",,,
+20417,"KM21","small_airport","Muhlenberg County Airport",37.225966,-87.156987,422,"NA","US","US-KY","Greenville","no","KM21",,"M21",,,
 20418,"KM22","small_airport","Bill Pugh Field",34.443746,-87.712159,723,"NA","US","US-AL","Russellville","no",,,"M22",,"https://en.wikipedia.org/wiki/Russellville_Municipal_Airport","Russellville Municipal"
 20419,"KM23","small_airport","James H Easom Field",32.311908,-89.135556,369,"NA","US","US-MS","Newton","no","KM23",,"M23",,,"O'Keefe Field"
 20420,"KM24","small_airport","Dean Griffin Memorial Airport",30.84320068359375,-89.15979766845703,270,"NA","US","US-MS","Wiggins","no","KM24",,"M24",,,
@@ -38908,7 +38909,7 @@
 20428,"KM34","small_airport","Kentucky Dam State Park Airport",37.00979,-88.299403,351,"NA","US","US-KY","Calvert City","no","KM34",,"M34","https://www.stateparks.com/kentucky_dam_state_park_airport_in_kentucky.html",,"Gilbertsville"
 20429,"KM36","small_airport","Frank Federer Memorial Airport",34.88029861450195,-91.17639923095703,194,"NA","US","US-AR","Brinkley","no","KM36",,"M36",,,
 20430,"KM37","small_airport","Ruleville Drew Airport",33.776402,-90.525002,137,"NA","US","US-MS","Drew","no","KM37",,"M37",,"https://en.wikipedia.org/wiki/Ruleville-Drew_Airport",
-20431,"KM40","small_airport","Monroe County Airport",33.873699188232,-88.489700317383,226,"NA","US","US-MS","Aberdeen/Amory","no","M40",,"M40",,"https://en.wikipedia.org/wiki/Monroe_County_Airport_(Mississippi)",
+20431,"KM40","small_airport","Monroe County Airport",33.873699,-88.4897,226,"NA","US","US-MS","Aberdeen","no","KM40",,"M40",,"https://en.wikipedia.org/wiki/Monroe_County_Airport_(Mississippi)","Amory"
 20432,"KM41","small_airport","Holly Springs Marshall County Airport",34.804298,-89.521103,553,"NA","US","US-MS","Holly Springs","no","KM41",,"M41",,"https://en.wikipedia.org/wiki/Holly_Springs-Marshall_County_Airport","Bishop Airport"
 20433,"KM43","small_airport","Prentiss Jefferson Davis County Airport",31.595352,-89.90653,455,"NA","US","US-MS","Prentiss","no","KM43",,"M43",,,
 20434,"KM44","small_airport","Houston Municipal Airport",33.886237,-89.02339,337,"NA","US","US-MS","Houston","no","KM44",,"M44",,"https://en.wikipedia.org/wiki/Houston_Municipal_Airport",
@@ -38936,7 +38937,7 @@
 20456,"KM79","small_airport","John H Hooks Jr Memorial Airport",32.485559,-91.772376,83,"NA","US","US-LA","Rayville","no","KM79",,"M79",,,
 20457,"KM80","small_airport","Scott Airport",32.416302,-91.148903,84,"NA","US","US-LA","Richmond","no","KM80",,"M80",,"https://en.wikipedia.org/wiki/Shirley_Field_(Tallulah,_Louisiana)",
 20458,"KM83","small_airport","Mccharen Field",33.58399963378906,-88.66670227050781,205,"NA","US","US-MS","West Point","no","KM83",,"M83",,,
-20459,"KM85","small_airport","Gideon Memorial Airport",36.44380187988281,-89.90380096435547,268,"NA","US","US-MO","Gideon","no","KM85",,"M85",,,
+20459,"KM85","small_airport","Gideon Memorial Airport",36.443802,-89.903801,268,"NA","US","US-MO","Gideon","no","KM85",,"M85",,,
 20460,"KM88","closed","Cornelia Fort Airpark",36.19029998779,-86.699699401855,418,"NA","US","US-TN","Nashville","no",,,,,,"KM88, KM88, M88"
 20461,"KM89","small_airport","Dexter B Florence Memorial Field",34.0998001099,-93.0661010742,182,"NA","US","US-AR","Arkadelphia","no","KADF",,"ADF",,"https://en.wikipedia.org/wiki/Dexter_B._Florence_Memorial_Field","M89"
 20462,"KM90","small_airport","William Robert Johnston Municipal Airport",36.7585983276,-120.371002197,162,"NA","US","US-CA","Mendota","no","M90",,"M90",,"https://en.wikipedia.org/wiki/Mendota_Airport","Q84"
@@ -42181,7 +42182,7 @@
 28831,"LFET","small_airport","Til Châtel Airfield",47.547501,5.21194,938,"EU","FR","FR-BFC","Til Châtel","no","LFET",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Til-Ch%C3%A2tel",
 28832,"LFEU","small_airport","Bar-le-Duc Airfield",48.867519,5.185068,909,"EU","FR","FR-GES","Les Hauts-de-Chée","no","LFEU",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Bar-le-Duc_-_Les_Hauts-de-Ch%C3%A9e","Bar le Duc, South Meuse Aeroclub"
 28833,"LFEV","small_airport","Gray St Adrien Airfield",47.432023,5.619518,679,"EU","FR","FR-BFC","Gray St Adrien","no","LFEV",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Gray_-_Saint-Adrien",
-28834,"LFEW","small_airport","Saulieu-Liernais Airport",47.239263,4.265928,1722,"EU","FR","FR-BFC","Liernais, Côte-d'Or","no","LFEW",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Saulieu_-_Liernais",
+28834,"LFEW","small_airport","Saulieu-Liernais Airfield",47.239263,4.265928,1722,"EU","FR","FR-BFC","Liernais, Côte-d'Or","no","LFEW",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Saulieu_-_Liernais",
 28835,"LFEX","small_airport","Nancy Azelot Airfield",48.59347,6.241035,961,"EU","FR","FR-GES","Azelot, Meurthe-et-Moselle","no","LFEX",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Nancy_-_Azelot",
 4101,"LFEY","small_airport","Île d'Yeu Airport",46.717641,-2.392544,79,"EU","FR","FR-PDL","Île d'Yeu","yes","LFEY","IDY",,,"https://en.wikipedia.org/wiki/%C3%8Ele_d'Yeu_Aerodrome",
 28836,"LFEZ","small_airport","Nancy-Malzéville Airfield",48.7244,6.20778,1253,"EU","FR","FR-GES","Saint-Max, Meurthe-et-Moselle","no","LFEZ",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Nancy_-_Malz%C3%A9ville",
@@ -42223,7 +42224,7 @@
 28864,"LFGM","small_airport","Montceau Les Mines Airfield",46.604198,4.33389,1030,"EU","FR","FR-BFC",,"no","LFGM",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Montceau-les-Mines_-_Pouilloux",
 28865,"LFGN","small_airport","Paray Le Monial Airfield",46.466381,4.133798,997,"EU","FR","FR-BFC",,"no","LFGN",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Paray-le-Monial",
 28866,"LFGO","small_airport","Pont-sur-Yonne Airfield",48.291587,3.245745,236,"EU","FR","FR-BFC","Gisy-les-Nobles, Yonne","no","LFGO",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Pont-sur-Yonne",
-28867,"LFGP","small_airport","Saint-Florentin - Chéu Airport",47.98019,3.775583,351,"EU","FR","FR-BFC","Jaulges, Yonne","no","LFGP",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Saint-Florentin_-_Ch%C3%A9u",
+28867,"LFGP","small_airport","Saint-Florentin - Chéu Airfield",47.98019,3.775583,351,"EU","FR","FR-BFC","Jaulges, Yonne","no","LFGP",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Saint-Florentin_-_Ch%C3%A9u",
 28868,"LFGQ","small_airport","Semur-en-Auxois Airfield",47.480998,4.342976,1053,"EU","FR","FR-BFC","Semur-en-Auxois, Côte-d'Or","no","LFGQ",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Semur-en-Auxois",
 28869,"LFGR","small_airport","Doncourt-lès-Conflans Airfield",49.152165,5.933447,804,"EU","FR","FR-GES","Doncourt-lès-Conflans","no","LFGR",,,,"https://en.wikipedia.org/wiki/Doncourt-l%C3%A8s-Conflans_Airport",
 28870,"LFGS","small_airport","Longuyon Villette Airfield",49.483617,5.571939,1148,"EU","FR","FR-GES",,"no","LFGS",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Longuyon_-_Villette",
@@ -42317,7 +42318,7 @@
 4135,"LFLH","medium_airport","Chalon-Champforgeuil Airfield",46.827021,4.819479,623,"EU","FR","FR-BFC","Fragnes-la-Loyère","no","LFLH",,,,"https://en.wikipedia.org/wiki/Chalon_-_Champforgeuil_Airfield",
 4136,"LFLI","medium_airport","Annemasse Airfield",46.192001,6.26839,1620,"EU","FR","FR-ARA","Annemasse","no","LFLI",,,"http://www.caa.asso.fr/","https://en.wikipedia.org/wiki/Annemasse_Aerodrome",
 28488,"LFLJ","small_airport","Courchevel Altiport",45.397531,6.63498,6583,"EU","FR","FR-ARA","Saint-Bon","no","LFLJ","CVF",,,"https://en.wikipedia.org/wiki/Courchevel_Altiport",
-28928,"LFLK","small_airport","Oyonnax-Arbent Airport",46.278424,5.666342,1755,"EU","FR","FR-ARA","Arbent, Ain","no","LFLK",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_d%27Oyonnax_-_Arbent","Jean Coutty, Aérodrome d'Oyonnax-Arbent, Centre de Vol à Voile du Haut-Bugey"
+28928,"LFLK","small_airport","Oyonnax-Arbent Airfield",46.278424,5.666342,1755,"EU","FR","FR-ARA","Arbent, Ain","no","LFLK",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_d%27Oyonnax_-_Arbent","Jean Coutty, Aérodrome d'Oyonnax-Arbent, Centre de Vol à Voile du Haut-Bugey"
 4137,"LFLL","large_airport","Lyon Saint-Exupéry Airport",45.725556,5.081111,821,"EU","FR","FR-ARA","Lyon","yes","LFLL","LYS",,"https://www.lyonaeroports.com/","https://en.wikipedia.org/wiki/Saint-Exup%C3%A9ry_International_Airport",
 4138,"LFLM","medium_airport","Aérodrome de Mâcon-Charnay",46.295101,4.79577,728,"EU","FR","FR-BFC","Mâcon/Charnay","no","LFLM",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_M%C3%A2con_-_Charnay",
 4139,"LFLN","medium_airport","Saint-Yan Airport",46.412498,4.01326,796,"EU","FR","FR-BFC","Saint-Yan","no","LFLN","SYT",,"http://www.aeroportsaintyan.fr/","https://en.wikipedia.org/wiki/Saint-Yan_Airport",
@@ -42411,7 +42412,7 @@
 28972,"LFPE","small_airport","Meaux-Esbly Airfield",48.927462,2.833457,217,"EU","FR","FR-IDF","Isles-lès-Villenoy, Seine-et-Marne","no","LFPE",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Meaux_-_Esbly","Aérodrome de Meaux-Esbly"
 28973,"LFPF","small_airport","Beynes Thiverval Airfield",48.843165,1.906279,371,"EU","FR","FR-IDF","Beynes, Yvelines","no","LFPF",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Beynes_-_Thiverval","Aérodrome de Beynes - Thiverval"
 4185,"LFPG","large_airport","Charles de Gaulle International Airport",49.012798,2.55,392,"EU","FR","FR-IDF","Paris (Roissy-en-France, Val-d'Oise)","yes","LFPG","CDG",,"http://www.aeroportsdeparis.fr/","https://en.wikipedia.org/wiki/Charles_de_Gaulle_Airport","PAR, Aéroport Roissy-Charles de Gaulle, Roissy Airport"
-28974,"LFPH","small_airport","Chelles-le-Pin Airport",48.896568,2.606206,207,"EU","FR","FR-IDF","Chelles, Seine-et-Marne","no","LFPH",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Chelles_-_Le_Pin","Aérodrome de Chelles-le-Pin"
+28974,"LFPH","small_airport","Chelles-le-Pin Airfield",48.896568,2.606206,207,"EU","FR","FR-IDF","Chelles, Seine-et-Marne","no","LFPH",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Chelles_-_Le_Pin","Aérodrome de Chelles-le-Pin"
 30241,"LFPI","heliport","Paris Issy-les-Moulineaux Heliport",48.832987,2.273043,112,"EU","FR","FR-IDF","Issy-les-Moulineaux, Hauts-de-Seine","no","LFPI",,,,"https://fr.wikipedia.org/wiki/H%C3%A9liport_de_Paris_-_Issy-les-Moulineaux_-_Val%C3%A9rie-Andr%C3%A9","JDP"
 4186,"LFPK","small_airport","Coulommiers-Voisins Aerodrome",48.839602,3.008653,470,"EU","FR","FR-IDF","Pommeuse, Seine-et-Marne","no","LFPK",,,,"https://en.wikipedia.org/wiki/Coulommiers_%E2%80%93_Voisins_Aerodrome","Aérodrome de Coulommiers - Voisins"
 28975,"LFPL","small_airport","Lognes Emerainville Airfield",48.821028,2.625967,359,"EU","FR","FR-IDF","Lognes, Seine-et-Marne","no","LFPL",,,,"https://fr.wikipedia.org/wiki/A%C3%A9rodrome_de_Lognes-%C3%89merainville","Aérodrome Lognes-Emerainville"
@@ -43173,7 +43174,7 @@
 43795,"LOKD","heliport","Föderlach Heliport",46.601768493652344,13.949712753295898,1619,"EU","AT","AT-2","Villach","no",,,,,,
 29462,"LOKF","small_airport","Feldkirchen Airfield",46.70893,14.076722,1706,"EU","AT","AT-2","Feldkirchen in Kärnten","no","LOKF",,,,"https://en.wikipedia.org/wiki/Feldkirchen-Ossiacher_See_Airport",
 29463,"LOKG","small_airport","Ferlach-Glainach Airfield",46.532778,14.330833,1498,"EU","AT","AT-2","Ferlach","no","LOKG",,,,"https://en.wikipedia.org/wiki/Ferlach-Glainach_Airport",
-29464,"LOKH","small_airport","Friesach/Hirt Airport",46.927491,14.431848,2019,"EU","AT","AT-2","Micheldorf","no","LOKH",,,,"https://en.wikipedia.org/wiki/Friesach/Hirt_Airport",
+29464,"LOKH","small_airport","Friesach/Hirt Airfield",46.927491,14.431848,2019,"EU","AT","AT-2","Micheldorf","no","LOKH",,,,"https://en.wikipedia.org/wiki/Friesach/Hirt_Airport",
 43796,"LOKI","heliport","Wietersdorf Heliport",46.8477783203125,14.536944389343262,2070,"EU","AT","AT-2","Wietersdorf","no",,,,,,
 43853,"LOKJ","heliport","Lienz Heliport",46.834999084472656,12.762778282165527,2254,"EU","AT","AT-7","Lienz","no",,,,,,
 43797,"LOKK","heliport","Hallegg Heliport",46.64805603027344,14.245833396911621,1493,"EU","AT","AT-2","Halleg","no",,,,,,
@@ -43211,7 +43212,7 @@
 21633,"LOR","heliport","Lowe AHP (Fort Rucker) Heliport",31.35580063,-85.75119781,294,"NA","US","US-AL","Fort Rucker Ozark","no","KLOR","LOR","LOR",,"https://en.wikipedia.org/wiki/Lowe_Army_Heliport",
 43821,"LOSJ","heliport","St. Johann Im Pongau Heliport",47.394168853759766,13.222222328186035,1803,"EU","AT","AT-5","St. Johann Im Pongau","no",,,,,,
 43822,"LOSL","heliport","Dachlandeplatz Heliport",47.80583953857422,13.027724266052246,1452,"EU","AT","AT-5","Salzburg","no",,,,,,
-29478,"LOSM","small_airport","Mauterndorf Airport",47.131995,13.695867,3642,"EU","AT","AT-5","Mauterndorf","no","LOSM",,,,"https://en.wikipedia.org/wiki/Mauterndorf_Airport","Flugplatz Mauterndorf"
+29478,"LOSM","small_airport","Mauterndorf Airfield",47.131995,13.695867,3642,"EU","AT","AT-5","Mauterndorf","no","LOSM",,,,"https://en.wikipedia.org/wiki/Mauterndorf_Airport","Flugplatz Mauterndorf"
 43823,"LOSS","heliport","Schwarzach Heliport",47.32444381713867,13.154999732971191,2046,"EU","AT","AT-5","Schwarzach","no",,,,,,
 4430,"LOWG","medium_airport","Graz Airport",46.9911,15.4396,1115,"EU","AT","AT-6","Feldkirchen bei Graz","yes","LOWG","GRZ",,"http://www.flughafen-graz.at/","https://en.wikipedia.org/wiki/Graz_Airport","Thalerhof Airport, Fliegerhorst Nittner, Nittner Air Base, Christophorus 12"
 4431,"LOWI","medium_airport","Innsbruck Airport",47.260201,11.344,1907,"EU","AT","AT-7","Innsbruck","yes","LOWI","INN",,"http://www.innsbruck-airport.com/","https://en.wikipedia.org/wiki/Innsbruck_Airport","Kranebitten Airport"
@@ -44645,7 +44646,7 @@
 4914,"MM73","small_airport","Huetamo Airport",18.52739906311,-100.8509979248,984,"NA","MX","MX-MIC","Huetamo","no","MM73",,"HTM",,"https://es.wikipedia.org/wiki/Aer%C3%B3dromo_de_Huetamo","MM2M"
 319375,"MM74","small_airport","Aeródromo de Chichen Itzá",20.68973,-88.566817,100,"NA","MX","MX-YUC","Tinum","no","MM74",,,,,"Pisté"
 4915,"MM75","small_airport","Agua Prieta Southwest Airport",31.242901,-109.625,4000,"NA","MX","MX-SON","Agua Prieta","no","MM75",,"MM75",,,
-4917,"MM77","small_airport","Las Delicias Airport",28.21310043334961,-105.447998046875,3888,"NA","MX","MX-CHH",,"no","MM77",,"MM77",,,
+4917,"MM77","closed","Las Delicias Airport",28.212933,-105.447989,3888,"NA","MX","MX-CHH","Delicias","no",,,,,,"MM77"
 4918,"MM79","small_airport","El Fuerte Airport",26.398199,-108.612,246,"NA","MX","MX-SIN","El Fuerte","no","MM79",,"FTE",,"https://en.wikipedia.org/wiki/El_Fuerte_Airport",
 4919,"MM80","small_airport","Rancho La Milpita Airport",30.4809,-109.643997,4707,"NA","MX","MX-SON","Nacozari de García","no","MM80",,"LCI",,"https://es.wikipedia.org/wiki/Aer%C3%B3dromo_de_La_Caridad","Aeródromo La Caridad"
 4920,"MM81","small_airport","Estación Aeronaval de Isla Socorro",18.775949,-110.930972,1085,"NA","MX","MX-COL","Archipiélago de Revillagigedo","no","MM81",,"MM81","https://www.gob.mx/semar","https://es.m.wikipedia.org/wiki/Archipiélago_de_Revillagigedo",
@@ -47996,6 +47997,7 @@
 537813,"MX-2393","closed","El Terrero Airport",29.18357,-107.3764,6236,"NA","MX","MX-CHH","Namiquipa","no",,,,,,
 538143,"MX-2394","closed","Salvatierra Airport",28.63424,-114.02857,407,"NA","MX","MX-BCN","San Quintín","no",,,,,,
 538144,"MX-2395","closed","San Francisco de Borja Airport",28.7313,-113.7494,1614,"NA","MX","MX-BCN","Ensenada","no",,,,,,
+538680,"MX-2396","closed","San Diego de Alcalá Airport",28.58608,-105.54563,3773,"NA","MX","MX-CHH","Aldama","no",,,,,,
 30631,"MX-AJS","small_airport","Punta Abreojos Airport",26.7272,-113.558998,26,"NA","MX","MX-BCS","Mulegé","no",,"AJS","AJS",,"https://en.wikipedia.org/wiki/Punta_Abreojos_Airstrip","MX86"
 30671,"MX-AZG","small_airport","Apatzingán - Pablo L. Sidar Airport",19.093399,-102.393997,1033,"NA","MX","MX-MIC","Apatzingán","no","MMAG","AZG","AZG",,"https://es.wikipedia.org/wiki/Aeropuerto_Nacional_Pablo_L._Sidar","MM16"
 43044,"MX-CEO","small_airport","El Crucero Airport",27.407301,-109.928001,114,"NA","MX","MX-SON","Cajeme","no",,,"CEO",,"https://es.wikipedia.org/wiki/Aer%C3%B3dromo_El_Crucero_(Sonora)",
@@ -52443,6 +52445,12 @@
 537864,"PH-0599","small_airport","RSY Tolong Airstrip",9.32164,122.87817,43,"AS","PH","PH-NER","Santa Catalina","no",,,,,,
 538543,"PH-0600","heliport","National Power Corporation Maramag Heliport",7.70686,125.02583,722,"AS","PH","PH-BUK","Maramag","no",,,,,,
 538544,"PH-0601","heliport","National Power Corporation Maramag Heliport",7.70686,125.02583,722,"AS","PH","PH-BUK","Maramag","no",,,,,,
+538643,"PH-0602","closed","Tanauan Airfield",11.10651,125.02015,30,"AS","PH","PH-LEY","Tanauan","no",,,,,,
+538644,"PH-0603","closed","Rizal (PNOC-EDC) Airport",11.16396,124.60028,541,"AS","PH","PH-LEY","Kananga","no",,,,,,
+538646,"PH-0604","closed","Bayug Airfield",10.9804,124.90742,149,"AS","PH","PH-LEY","Burauen","no",,,,,,
+538647,"PH-0605","closed","San Pablo Airfield",10.98348,124.92507,125,"AS","PH","PH-LEY","Burauen","no",,,,,,
+538648,"PH-0606","closed","Buri Airfield",10.99169,124.90239,177,"AS","PH","PH-LEY","Burauen","no",,,,,,
+538649,"PH-0607","closed","Dulag Airfield",10.95417,125.01019,36,"AS","PH","PH-LEY","Dulag","no",,,,,,
 31007,"PH-ENI","small_airport","El Nido Airport",11.202399,119.416087,,"AS","PH","PH-PLW","El Nido","yes","RPEN","ENI",,,"https://en.wikipedia.org/wiki/El_Nido_Airport","El Nido"
 5441,"PHBK","medium_airport","Barking Sands Airport",22.0228,-159.785004,23,"OC","US","US-HI","Kekaha","no","PHBK","BKH","BKH",,"https://en.wikipedia.org/wiki/Pacific_Missile_Range_Facility","Pacific Missle Range Facility Barking Sands, Kauai"
 5442,"PHDH","small_airport","Kawaihapai Airfield",21.5795,-158.197006,14,"OC","US","US-HI","Mokuleia","no","PHDH","HDH","HDH",,"https://en.wikipedia.org/wiki/Dillingham_Airfield","Dillingham"
@@ -59527,6 +59535,7 @@
 36739,"SJNY","heliport","Iberostar Praia do Forte Heliport",-12.549641,-37.990776,33,"SA","BR","BR-BA","Mata de São João","no","SJNY",,"BA0208",,,
 36740,"SJNZ","small_airport","Fazenda Três Lagoas Airport",-13.258413,-58.727975,1755,"SA","BR","BR-MT","Sapezal","no","SNZP",,"MT0577",,,"SJNZ"
 534537,"SJO2","small_airport","Fazenda União Airstrip",-15.526797,-57.014003,1398,"SA","BR","BR-MT","Nossa Senhora do Livramento","no","SJO2",,"MT1015",,,
+538694,"SJO3","small_airport","Fazenda Santa Carmem II Airport",-13.215231,-52.271181,1333,"SA","BR","BR-MT","Querência","no","SJO3",,"MT1020",,,
 36741,"SJOA","heliport","Fazenda Fortaleza Heliport",-23.178892,-45.471429,2155,"SA","BR","BR-SP","Taubaté","no","SDUZ",,"SP0433",,,"SJOA"
 36742,"SJOB","closed","Estáncia Parque Atibaia Heliport",-23.080299,-46.581902,2874,"SA","BR","BR-SP","Atibaia","no",,,,,,"SJOB"
 36743,"SJOC","heliport","Hotel Paradise Heliport",-21.110785,-48.964466,1952,"SA","BR","BR-SP","Catanduva","no","SNHO",,"SP0704",,,"SJOC"
@@ -61047,6 +61056,7 @@
 533794,"SN8H","small_airport","Fazenda Maritaca Airstrip",-9.655319,-50.900989,748,"SA","BR","BR-PA","Santana do Araguaia","no","SN8H",,"PA0400",,,
 533797,"SN8I","heliport","Blue Sky Heliport",-23.007972,-43.403199,7,"SA","BR","BR-RJ","Rio de Janeiro","no","SN8I",,"RJ0340",,,
 533826,"SN8N","heliport","Haras Beatriz Heliport",-5.008889,-47.544167,1243,"SA","BR","BR-MA","Açailândia","no","SN8N",,"MA0189",,,
+538690,"SN8Z","small_airport","Fazenda São Francisco Airport",-11.000292,-52.733169,1181,"SA","BR","BR-MT","São José do Xingu","no","SN8Z",,"MT1005",,,
 24666,"SN90","small_airport","Eibes Airfield",39.226959,-95.192231,1100,"NA","US","US-KS","McLouth","no","SN90",,"SN90",,,"D'Field Airport"
 24667,"SN91","small_airport","Godfrey Airport",38.11161,-96.113956,1100,"NA","US","US-KS","Madison","no",,,"SN91",,,
 24668,"SN92","small_airport","Sunshine Ranch Airport",39.331504,-96.700136,1300,"NA","US","US-KS","Manhattan","no",,,"SN92",,,
@@ -67586,7 +67596,7 @@
 336246,"US-1699","closed","Saint George Landing Strip",41.181012,-87.777758,,"NA","US","US-IL","Saint George","no",,,,,,
 336247,"US-1700","closed","Viall Homestead Landing Strip",41.29526,-87.87154,,"NA","US","US-IL","Manteno","no",,,,,,
 336248,"US-1701","small_airport","Davis Field",41.99783,-84.476468,1185,"NA","US","US-MI","Jerome","no",,,"79MI",,,
-336250,"US-1702","small_airport","WFK Airport",35.919208,-90.729712,393,"NA","US","US-AR","Jonesboro","no","81AR",,"81AR",,,
+336250,"US-1702","small_airport","WFK Airport",35.919208,-90.729712,393,"NA","US","US-AR","Jonesboro","no","81AR",,"81AR",,,"Webb Footed Kennels"
 336252,"US-1703","small_airport","Van Farowe Airfield",42.86912,-85.94893,,"NA","US","US-MI","Hudsonville","no",,,,,,
 336253,"US-1704","small_airport","Dawson Private Strip",27.444844,-97.905942,74,"NA","US","US-TX","Kingsville","no",,,"40TS",,,
 336254,"US-1705","heliport","East Carroll Parish Hospital Heliport",32.811471,-91.172592,95,"NA","US","US-LA","Lake Providence","no",,,"LS11",,,
@@ -74638,12 +74648,12 @@
 537937,"US-8737","small_airport","Aerial Spraying Service Airport",35.11509,-77.78653,141,"NA","US","US-NC","Albertson","no",,,,,,
 537939,"US-8738","closed","Mayer Airport",43.96024,-99.11267,479,"NA","US","US-SD","Pukwana","no",,,,,,
 537940,"US-8739","closed","Shannonville Airport",35.27013,-90.49043,216,"NA","US","US-AR","Earle","no",,,,,,
-537942,"US-8740","closed","Tyronza River Airport",35.3211,-90.48561,216,"NA","US","US-AR","Earle","no",,,,,,
+537942,"US-8740","closed","Crown Mill Farm Airport",35.3211,-90.48561,216,"NA","US","US-AR","Earle","no",,,,,,
 537943,"US-8741","closed","Twist Airport",35.37991,-90.48383,215,"NA","US","US-AR","Earle","no",,,,,,
 537944,"US-8742","small_airport","Cloar Airport",35.3055,-90.45072,215,"NA","US","US-AR","Earle","no",,,,,,"Stokes"
 537945,"US-8743","small_airport","Stokes Flying Services Airport",35.23968,-90.57052,211,"NA","US","US-AR","Parkin","no",,,,,,
 538023,"US-8744","small_airport","Mike Harmon Aviation Airport",45.24545,-98.779354,1365,"NA","US","US-SD","Mansfield","no",,,,,,
-538031,"US-8745","small_airport","Cartillar Flying Services Airport",35.32218,-91.003,222,"NA","US","US-AR","Hickory Ridge","no",,,,,,
+538031,"US-8745","small_airport","Cartillar Flying Services Tilton Airport",35.319361,-91.00316,222,"NA","US","US-AR","Hickory Ridge","no",,,,,,
 538034,"US-8746","small_airport","Hamlin Flying Service Airport",35.24605,-90.94233,222,"NA","US","US-AR","Wynne","no",,,,,,
 538035,"US-8747","closed","Greg's Airport",35.26302,-90.79809,253,"NA","US","US-AR","Wynne","no",,,,,,
 538038,"US-8748","closed","Patterson Airport",35.25401,-91.22015,199,"NA","US","US-AR","McCrory","no",,,,,,
@@ -74708,6 +74718,47 @@
 538616,"US-8807","closed","Deer River Municipal Airport",47.35269,-93.80008,1324,"NA","US","US-MN","Deer River","no",,,,,,
 538617,"US-8808","closed","Bartick Airport",47.355,-93.79041,1306,"NA","US","US-MN","Deer River","no",,,,,,
 538618,"US-8809","closed","Caring Wings Airport",37.04611,-87.06328,647,"NA","US","US-KY","Lewisburg","no",,,,,,
+538619,"US-8810","closed","Deeson Airport",34.019,-90.86689,156,"NA","US","US-MS","Shelby","no",,,,,,
+538620,"US-8811","small_airport","Conner Airport",32.7939,-91.10037,104,"NA","US","US-MS","Rolling Fork","no",,,,,,
+538623,"US-8812","small_airport","Bowie Airport",32.85386,-90.71112,97,"NA","US","US-MS","Yazoo City","no",,,,,,
+538627,"US-8813","small_airport","Blanton Airport",32.75678,-90.9286,99,"NA","US","US-MS","Rolling Fork","no",,,,,,
+538629,"US-8814","closed","Priddy Airport",32.73779,-90.89159,87,"NA","US","US-MS","Rolling Fork","no",,,,,,
+538630,"US-8815","small_airport","Issaquena Airport",32.77441,-90.9301,101,"NA","US","US-MS","Cary","no",,,,,,
+538632,"US-8816","small_airport","Egypt Airport",33.337747,-90.273099,122,"NA","US","US-MS","Cruger","no",,,,,,"Egypt Plantation"
+538633,"US-8817","small_airport","Leflore Airport",33.39172,-90.20823,122,"NA","US","US-MS","Cruger","no",,,,,,
+538635,"US-8818","small_airport","Isola Airport",33.26855,-90.57327,110,"NA","US","US-MS","Isola","no",,,,,,
+538637,"US-8819","small_airport","Miles Flying Service Airport",35.91688,-90.79291,284,"NA","US","US-AR","Bono","no",,,,,,
+538639,"US-8820","small_airport","Mack's Custom Aviation Airport",34.47143,-91.42968,203,"NA","US","US-AR","Crocketts Bluff","no",,,,,,
+538642,"US-8821","small_airport","Westcoat Flying Service Airport",36.68098,-89.55948,303,"NA","US","US-MO","New Madrid","no",,,,,,
+538681,"US-8822","closed","Walcott Airfield",36.03774,-90.70089,298,"NA","US","US-AR","Walcott","no",,,,,,
+538691,"US-8823","small_airport","Haynes Flying Service Airport",34.99122,-90.93832,212,"NA","US","US-AR","Palestine","no",,,,,,
+538693,"US-8824","small_airport","Racer's Ag Airport",34.9347,-90.99214,210,"NA","US","US-AR","Palestine","no",,,,,,
+538697,"US-8825","small_airport","Hooker Field",34.95019,-90.90218,214,"NA","US","US-AR","Palestine","no",,,,,,
+538715,"US-8826","closed","Smokey Alley Farms Airport",35.31329,-90.35648,217,"NA","US","US-AR","Crawfordsville","no",,,,,,
+538716,"US-8827","small_airport","Cartillar Flying Services Fisher Airport",35.48286,-90.90091,238,"NA","US","US-AR","Fisher","no",,,,,,
+538717,"US-8828","closed","Tilley Airport",35.48576,-90.94385,233,"NA","US","US-AR","Fisher","no",,,,,,
+538719,"US-8829","closed","Grindstone Ridge Airport",35.45331,-90.97792,232,"NA","US","US-AR","Fisher","no",,,,,,
+538722,"US-8830","small_airport","Cartillar Flying Services Hickory Ridge Airport",35.387784,-90.98954,231,"NA","US","US-AR","Hickory Ridge","no",,,,,,
+538723,"US-8831","closed","Goodart Farms Airport",35.38639,-90.98343,227,"NA","US","US-AR","Hickory Ridge","no",,,,,,
+538724,"US-8832","closed","Horst Airport",35.5448,-90.92673,241,"NA","US","US-AR","Weiner","no",,,,,,
+538725,"US-8833","closed","Waldenburg Airport",35.56035,-90.93439,237,"NA","US","US-AR","Weiner","no",,,,,,
+538726,"US-8834","small_airport","Folden Aviation Services Airport",35.54418,-91.00145,228,"NA","US","US-AR","Weiner","no",,,,,,
+538727,"US-8835","closed","Bryant Airport",35.32216,-91.33603,227,"NA","US","US-AR","Augusta","no",,,,,,
+538729,"US-8836","closed","Holden Conner Field",35.35477,-91.31173,215,"NA","US","US-AR","Newport","no",,,,,,
+538730,"US-8837","small_airport","Rice Airport",35.04254,-91.1073,209,"NA","US","US-AR","Hunter","no",,,,,,
+538732,"US-8838","small_airport","Harvey Airport",61.95969,-150.07305,235,"NA","US","US-AK","Willow","no",,,,,,
+538733,"US-8839","closed","Goodwin Airport",34.942565,-91.028745,207,"NA","US","US-AR","Goodwin","no",,,,,,
+538734,"US-8840","closed","Monroe Airport",34.7403,-91.10827,186,"NA","US","US-AR","Monroe","no",,,,,,
+538735,"US-8841","closed","Montgomery Field",34.28532,-90.98089,156,"NA","US","US-AR","Lambrook","no",,,,,,
+538736,"US-8842","small_airport","Mud Lake Plantation Airport",34.94001,-90.56242,202,"NA","US","US-AR","Hughes","no",,,,,,
+538737,"US-8843","closed","Taylor Airport",34.94806,-90.57489,196,"NA","US","US-AR","Hughes","no",,,,,,
+538754,"US-8844","closed","Reinhart Airport",35.07682,-90.61465,202,"NA","US","US-AR","Widener","no",,,,,,
+538755,"US-8845","closed","Lake Bivens Airport",35.10325,-90.59022,205,"NA","US","US-AR","Widener","no",,,,,,
+538756,"US-8846","closed","Wheeler Bar Airport",35.37817,-90.56011,213,"NA","US","US-AR","Parkin","no",,,,,,
+538757,"US-8847","closed","Valentine Farms Airport",35.38963,-90.5341,213,"NA","US","US-AR","Earle","no",,,,,,
+538758,"US-8848","closed","Nag Farms Airport",35.49041,-90.39161,215,"NA","US","US-AR","Tyronza","no",,,,,,
+538762,"US-8849","small_airport","Newsom Farm Airport",32.99991,-91.00548,105,"NA","US","US-MS","Glen Allan","no",,,,,,
+538763,"US-8850","small_airport","Vance Airport",33.26645,-90.976,113,"NA","US","US-MS","Greenville","no",,,,,,
 15357,"US-92N","heliport","Steel Pier Taj Mahal Heliport",39.356426,-74.418232,29,"NA","US","US-NJ","Atlantic City","no","28NJ",,"28NJ",,,"Formerly 92N"
 15405,"US-93TX","closed","Putz Aero Inc Airport",30.915738,-96.685774,279,"NA","US","US-TX","Calvert","no",,,,,,"93TX"
 38690,"US-BPA","closed","Grumman Bethpage Airport",40.749401092499994,-73.4960021973,115,"NA","US","US-NY","Bethpage","no",,,,,,"BPA, BPA"
@@ -76427,7 +76478,7 @@
 41421,"WABW","small_airport","Waren Airport",-1.6285300254822,134.12399291992,29,"AS","ID","ID-PB","Momi-Papua Island","no","WABW",,,,,
 310447,"WABY","small_airport","Kebo Airstrip",-3.8248,136.385844,5845,"AS","ID","ID-PT","Kebo","no","WABY",,,,,
 316463,"WAD","small_airport","Andriamena Airport",-17.631,47.7233,2475,"AF","MG","MG-M","Andriamena","no",,"WAD",,,,
-26749,"WADA","small_airport","Selaparang Airport",-8.56056,116.095097,52,"AS","ID","ID-NB","Mataram","no","WADA","AMI",,,"https://en.wikipedia.org/wiki/Selaparang_Airport","WRRA"
+26749,"WADA","closed","Selaparang Airport",-8.56056,116.095097,52,"AS","ID","ID-NB","Mataram","no",,,,,"https://en.wikipedia.org/wiki/Selaparang_Airport","WRRA, WADA, AMI"
 26750,"WADB","small_airport","Sultan Muhammad Salahuddin Airport",-8.537184,118.685002,3,"AS","ID","ID-NB","Bima","yes","WADB","BMU",,,"https://en.wikipedia.org/wiki/Bima_Airport","WRRB, PBW, Palibelo Airport, Bima, Raba Airfield"
 26751,"WADD","large_airport","Ngurah Rai (Bali) International Airport",-8.74817,115.167,14,"AS","ID","ID-BA","Denpasar","yes","WADD","DPS",,"http://www.angkasapura1.co.id/eng/location/bali.htm","https://en.wikipedia.org/wiki/Ngurah_Rai_Airport","WRRR"
 299629,"WADL","medium_airport","Lombok International Airport",-8.757792,116.275435,319,"AS","ID","ID-NB","Mataram","yes","WADL","LOP",,"http://www.lombok-airport.co.id/","https://en.wikipedia.org/wiki/Lombok_International_Airport","Bandara Udara Internasional Lombok"
@@ -78317,7 +78368,7 @@
 27634,"YIKM","small_airport","Inkerman Airport",-16.229225,141.434607,6,"OC","AU","AU-QLD","Inkerman","no","YIKM","IKP",,,,
 27635,"YILA","small_airport","Milawa Vineyard Airport",-36.4561968657,146.43306303,,"OC","AU","AU-VIC",,"no","YILA",,,,,
 525289,"YILF","small_airport","Ilfracombe Airport",-23.475813,144.529811,720,"OC","AU","AU-QLD",,"no","YILF",,,,,
-38397,"YILT","heliport","Milton Airport",-35.3208007812,150.438995361,,"OC","AU","AU-NSW",,"no","YILT",,,,,
+38397,"YILT","heliport","Ulladulla Medical Heliport",-35.32076,150.439306,181,"OC","AU","AU-NSW","Milton","no","YXUA",,,,,"YILT"
 28472,"YILW","small_airport","Inglewood Airport",-28.4188,151.0955,840,"OC","AU","AU-QLD","Inglewood","no","YILW",,,,,
 38398,"YIMA","small_airport","Imanpa Airport",-25.130954,132.565738,,"OC","AU","AU-NT",,"no","YIMA",,,,,
 27636,"YIMB","small_airport","Kimba Airport",-33.093182,136.466315,763,"OC","AU","AU-SA","Kimba","no","YIMB",,,,"https://en.wikipedia.org/wiki/Kimba_Airport",
@@ -79355,7 +79406,7 @@
 309221,"YXBD","heliport","Bundaberg Base Hospital Helipad",-24.869446,152.335045,60,"OC","AU","AU-QLD","Bundaberg","no","YXBD",,"YXBD",,,
 335459,"YXBH","heliport","Bathurst Hospital Helipad",-33.40587,149.571884,2240,"OC","AU","AU-NSW","Bathurst","no","YXBH",,,,,
 309216,"YXBI","heliport","Biggenden Hospital Helipad",-25.506941,152.050651,391,"OC","AU","AU-QLD","Biggenden","no","YXBI",,"YXBI",,,
-309190,"YXBM","heliport","Batemans Bay Helipad",-35.71301,150.1872,3,"OC","AU","AU-NSW","Batemans Bay","no","YXBM",,"YXBM",,,
+309190,"YXBM","heliport","Batemans Bay Helipad",-35.71301,150.1872,3,"OC","AU","AU-NSW","Batemans Bay","no",,,,,,"YXBM"
 309215,"YXBS","heliport","Beaudesert Hospital Helipad",-27.98571,153.002345,265,"OC","AU","AU-QLD","Beaudesert","no","YXBS",,"YXBS",,,
 506699,"YXBT","small_airport","Ballarat Health Service Helipad",-37.559121,143.845685,1516,"OC","AU","AU-VIC","Ballarat","no","YXBT",,,,,
 309962,"YXBU","heliport","Bulwer Heliport",-27.07233,153.36748,29,"OC","AU","AU-QLD","Bulwer","no","YXBU",,"YXBU",,,
diff --git a/runways.csv b/runways.csv
index e6f4d5850..fefb0ddad 100644
--- a/runways.csv
+++ b/runways.csv
@@ -23353,7 +23353,7 @@
 241577,20265,"KK79",4205,75,"PEM",1,0,"17",37.99020004272461,-99.89420318603516,2462,181,,"35",37.97869873046875,-99.89450073242188,2465,1,
 240054,20266,"KK81",3400,60,"ASP",1,0,"03",38.537498474121094,-94.92320251464844,930,38,,"21",38.5447998046875,-94.91590118408203,931,218,
 240055,20266,"KK81",2650,60,"GRS",0,0,"15",38.5432014465332,-94.92379760742188,926,153,,"33",38.53670120239258,-94.91950225830078,939,333,
-245694,20267,"KK82",2453,75,"GRS",0,0,"14",39.76300048828125,-98.7948989868164,1794,151.1,,"32",39.75709915161133,-98.79070281982422,1791,331.1,
+245694,20267,"KK82",4400,75,"ASP",1,0,"14",39.7686,-98.7989,1786,151,,"32",39.7581,-98.7911,1800,331,
 245695,20267,"KK82",3601,50,"ASP",1,0,"17",39.7666015625,-98.7938003540039,1797,180.3,,"35",39.75680160522461,-98.79389953613281,1787,0.3,101
 245672,20268,"KK83",3100,40,"ASP",1,0,"01",39.900001525878906,-95.78079986572266,,14,,"19",39.90829849243164,-95.7780990600586,,194,
 245673,20268,"KK83",1440,70,"GRS",0,0,"12",39.9031982421875,-95.77899932861328,,124.2,,"30",39.9010009765625,-95.7748031616211,,304.2,
@@ -35434,7 +35434,7 @@
 261060,35947,"SIEZ",3281,66,"GRS",0,0,"18",,,,,,"36",,,,,
 538599,538598,"SIF2",2953,59,"GVL",0,0,"14",,,,,,"32",,,,,
 538604,538602,"SIF3",3935,59,"Piçarra",0,0,"17",,,,,,"35",,,,,
-538600,538593,"SIF4",69,69,"CON",0,0,"11",,,,,,,,,,,
+538600,538593,"SIF4",69,69,"CON",1,0,"11",,,,,,,,,,,
 260875,35948,"SIFA",2625,59,"GRS",0,0,"13",,,,,,"34",,,,,
 263078,35949,"SIFB",75,75,"CON",0,0,"23",,,,,,,,,,,
 261269,35950,"SIFC",2625,82,"ASP",0,0,"3",,,,,,"21",,,,,
@@ -36564,6 +36564,7 @@
 263041,36739,"SJNY",69,69,"CON",0,0,"27",,,,,,"36",,,,,
 261610,36740,"SJNZ",3773,62,"ASP",0,0,"1",,,,,,"19",,,,,
 534538,534537,"SJO2",1968,59,"Earth",0,0,"03",,,,,,"21",,,,,
+538696,538694,"SJO3",3937,75,"GVL",0,0,"03",,,,,,"21",,,,,
 263267,36741,"SJOA",66,66,"GRS",0,0,"17",,,,,,"35",,,,,
 262978,36743,"SJOC",69,69,"CON",0,0,"9",,,,,,,,,,,
 263119,36744,"SJOD",79,79,"CON",0,0,"18",,,,,,,,,,,
@@ -37220,6 +37221,7 @@
 524647,524646,"SN8C",4265,59,"GRS",0,0,"06",,,,,,"24",,,,,
 532067,532064,"SN8F",3445,75,"Earth",0,0,"04",,,,,,"22",,,,,
 531824,531822,"SN8G",2298,59,"Earth",0,0,"12",,,,,,"30",,,,,
+538692,538690,"SN8Z",3279,59,"GVL",0,0,"09",,,,,,"27",,,,,
 258092,24666,"SN90",2300,40,"TURF",0,0,"N",,,,,,"S",,,,,
 253112,24667,"SN91",2300,100,"TURF-DIRT",0,0,"06",,,,,,"24",,,,,
 257183,24668,"SN92",2100,60,"TURF",0,0,"N",,,,,,"S",,,,,