diff --git a/airports.csv b/airports.csv
index eb53301dd..58485a324 100644
--- a/airports.csv
+++ b/airports.csv
@@ -557,7 +557,7 @@
 6989,"08MI","heliport","Sparrow Hospital Heliport",42.734474,-84.536046,1019,"NA","US","US-MI","Lansing","no","08MI",,"08MI",,,
 6990,"08MN","seaplane_base","Christenson Point Seaplane Base",47.66939926147461,-93.05439758300781,1372,"NA","US","US-MN","Chisholm/Hibbing","no","08MN",,"08MN",,,
 6991,"08MO","small_airport","Twin Oaks Airport",37.395599,-94.283798,955,"NA","US","US-MO","Jasper","no","08MO",,"08MO",,,
-6992,"08MS","small_airport","Williams Field",34.66220093,-89.86830139,345,"NA","US","US-MS","Coldwater","no","08MS",,"08MS",,,
+6992,"08MS","small_airport","Midsouth Airpark",34.661506,-89.869628,345,"NA","US","US-MS","Coldwater","no","08MS",,"08MS",,,"Williams Field"
 6993,"08MT","small_airport","Matovich Airport",47.065679,-108.809624,3450,"NA","US","US-MT","Grass Range","no","08MT",,"08MT",,,"Clark Airport"
 6994,"08N","small_airport","Keller Brothers Airport",40.291801,-76.328796,550,"NA","US","US-PA","Lebanon","no","08N",,"08N",,"https://en.wikipedia.org/wiki/Keller_Brothers_Airport",
 6995,"08NC","small_airport","Whiteheart Farm Airport",36.06760025024414,-80.4655990600586,750,"NA","US","US-NC","Lewisville","no","08NC",,"08NC",,,
@@ -1380,7 +1380,7 @@
 45923,"11Y","small_airport","Flying Feathers Airport",44.061183,-88.194933,940,"NA","US","US-WI","Chilton","no","11Y",,"11Y","https://wisconsindot.gov/Documents/travel/air/airport-info/arpts/chilton.pdf",,"06WI"
 7750,"12A","small_airport","Arkavalley Airport",35.17839813,-92.33540344,329,"NA","US","US-AR","Conway","no","12A",,"12A",,,"Formerly 12AR"
 7749,"12AL","heliport","Goldberg Stagefield Army Heliport",31.416064,-85.463591,362,"NA","US","US-AL","Midland City","no","12AL",,"12AL",,,
-45301,"12AR","small_airport","Gibbons Airport",34.515444,-90.973722,178,"NA","US","US-AR","Marvell","no","12AR",,"12AR",,,
+45301,"12AR","small_airport","Gibbons Airport",34.515387,-90.97352,178,"NA","US","US-AR","Marvell","no","12AR",,"12AR",,,"Andy Riddell Flying"
 7751,"12AZ","small_airport","Ranta Strip",33.853901,-112.653001,1840,"NA","US","US-AZ","Morristown","no","12AZ",,"12AZ",,,"05E"
 7752,"12CA","small_airport","Faber Vineyards Airport",38.10960006713867,-121.16899871826172,70,"NA","US","US-CA","Lodi","no","12CA",,"12CA",,,
 7753,"12CL","small_airport","Newton Field",36.156898498535156,-119.8499984741211,194,"NA","US","US-CA","Stratford","no","12CL",,"12CL",,,
@@ -5532,7 +5532,7 @@
 11341,"4AR2","small_airport","Red Oak Airport",34.910462,-92.006932,315,"NA","US","US-AR","Cabot","no","4AR2",,"4AR2",,,
 11342,"4AR3","heliport","Conway Regional Health System Heliport",35.0853996277,-92.457901001,385,"NA","US","US-AR","Conway","no","4AR3",,"4AR3",,,
 11343,"4AR4","closed","Reed-Joseph Land Company Airport",33.347199,-93.741677,227,"NA","US","US-AR","Garland City","no",,,,,,"4AR4"
-11344,"4AR5","small_airport","Lawrence Field",35.37080001831055,-90.75060272216797,284,"NA","US","US-AR","Cherry Valley","no","4AR5",,"4AR5",,,
+11344,"4AR5","small_airport","Lawrence Field",35.371502,-90.754243,284,"NA","US","US-AR","Cherry Valley","no","4AR5",,"4AR5",,,"Memphis Soaring Society"
 11345,"4AR6","closed","Williams Ranch Airport",34.376985,-93.633599,750,"NA","US","US-AR","Caddo Gap","no",,,,,,"4AR6"
 11346,"4AR7","small_airport","Worth James Ranch Airport",35.08340072631836,-94.11689758300781,650,"NA","US","US-AR","Booneville","no","4AR7",,"4AR7",,,
 11347,"4AR8","heliport","Washington Regional Landing Heliport",36.10810089111328,-94.15859985351562,1251,"NA","US","US-AR","Fayetteville","no","4AR8",,"4AR8",,,
@@ -6758,7 +6758,7 @@
 325314,"5JY9","heliport","Air Evac 116 Heliport",37.852777,-82.546111,640,"NA","US","US-KY","Inez","no","5JY9",,"5JY9",,,
 12424,"5K0","small_airport","Bressler Field",39.74250030517578,-101.55599975585938,3489,"NA","US","US-KS","Bird City","no","5K0",,"5K0",,,
 18909,"5K2","small_airport","Tribune Municipal Airport",38.450901,-101.750135,3620,"NA","US","US-KS","Tribune","no","5K2",,"5K2",,,"Tribune Greeley County"
-12425,"5K3","heliport","H. J. Paul Army Heliport",41.06669998168945,-96.33360290527344,1068,"NA","US","US-NE","Camp Ashland(Ashland)","no","5K3",,"5K3",,,
+12425,"5K3","heliport","H. J. Paul Army Heliport",41.06823,-96.338804,1068,"NA","US","US-NE","Ashland","no","K5K3",,"5K3",,,"Camp Ashland"
 12426,"5K4","small_airport","Schuy-Rush Airport",40.1175,-90.590401,665,"NA","US","US-IL","Rushville","no","5K4",,"5K4",,"https://en.wikipedia.org/wiki/Schuy-Rush_Airport",
 12427,"5K6","closed","Westosha Airport",42.514099,-88.2052,850,"NA","US","US-WI","Wilmot","no",,,,,,"5K6, WI10"
 12428,"5K9","small_airport","Pruetz Municipal Airport",46.28889846801758,-98.94210052490234,1982,"NA","US","US-ND","Kulm","no","5K9",,"5K9",,,
@@ -10720,7 +10720,7 @@
 15819,"9MN6","small_airport","Merill L Harris Field",44.644216,-93.700762,800,"NA","US","US-MN","Jordan","no","9MN6",,"9MN6",,,
 15820,"9MN7","heliport","Watonwan Memorial Hospital Heliport",43.97999954223633,-94.61689758300781,1078,"NA","US","US-MN","St James","no","9MN7",,"9MN7",,,
 15821,"9MN8","closed","Whiskey Lake Seaplane Base",45.973098,-95.576104,1354,"NA","US","US-MN","Brandon","no",,,,,,"9MN8"
-15822,"9MN9","closed","Tofte Airport",47.587851,-90.823407,790,"NA","US","US-MN","Tofte","no",,,,,,"9MN9"
+15822,"9MN9","closed","Tofte Airport",47.587851,-90.823407,790,"NA","US","US-MN","Tofte","no",,,,,,"9MN9, Cathedral of the Pines, Gervais"
 15823,"9MO0","heliport","Anheuser/Busch Inc Heliport",38.59170150756836,-90.2083969116211,548,"NA","US","US-MO","St Louis","no","9MO0",,"9MO0",,,
 15824,"9MO1","heliport","Missouri Baptist Hospital Heliport",38.63529968261719,-90.44599914550781,630,"NA","US","US-MO","St Louis","no","9MO1",,"9MO1",,,
 15825,"9MO2","heliport","Fitzgibbon Hospital Heliport",39.11249923706055,-93.18910217285156,744,"NA","US","US-MO","Marshall","no","9MO2",,"9MO2",,,
@@ -14110,7 +14110,7 @@
 525733,"BO-0018","small_airport","Carol Marghata Airport",-17.43685,-62.34296,885,"SA","BO","BO-S",,"no","SLCH",,,,,
 534873,"BO-0019","small_airport","Pepinalito Airstrip",-18.839831,-64.620142,8136,"SA","BO","BO-H","Redención Pampa","no",,,,,,
 41590,"BO-BVL","small_airport","Baures Airport",-13.654426,-63.704718,470,"SA","BO","BO-B","Baures","no","SLBA","BVL",,,"https://en.wikipedia.org/wiki/Baures_Airport",
-322356,"BOBS","small_airport","Bobs",35.391523,-91.443706,,"NA","US","US-AR","Bradford","no",,,,,,
+322356,"BOBS","small_airport","Bobs Field",35.392188,-91.443871,,"NA","US","US-AR","Bradford","no",,,,,,
 16503,"BOF","closed","Bolling Air Force Base",38.854049,-77.012046,20,"NA","US","US-DC","Washington","no",,,,,"https://en.wikipedia.org/wiki/Joint_Base_Anacostia-Bolling","BOF, KBOF"
 16504,"BOK","small_airport","Brookings Airport",42.0746,-124.290001,459,"NA","US","US-OR","Brookings","no","KBOK","BOK","BOK",,"https://en.wikipedia.org/wiki/Brookings_Airport",
 322375,"BONI","small_airport","McCready's Aero Service Airport",32.90511,-91.712934,103,"NA","US","US-LA","Bonita","no",,,,,,
@@ -17178,6 +17178,7 @@
 536990,"CA-0935","closed","King Eddys Landing Field",50.21596,-119.17362,1710,"NA","CA","CA-BC","Coldstream","no",,,,,,
 538029,"CA-0936","small_airport","Castle Rock Airport",52.51069,-122.47769,2113,"NA","CA","CA-BC","Cariboo","no",,,,,,
 538141,"CA-0937","closed","Iron Bridge Aerodrome",46.28056,-83.1854,692,"NA","CA","CA-ON","Iron Bridge","no",,,,,,
+538538,"CA-0938","small_airport","Nazko Airfield",53.09207,-123.56459,2700,"NA","CA","CA-BC","Nazko","no",,,,,,
 43086,"CA-CAB5","heliport","Abbotsford (Regional Hospital & Cancer Centre) Heliport",49.0361500085,-122.314048558,287,"NA","CA","CA-BC","Abbotsford","no","CAB5",,"CAB5",,,
 16531,"CA00","heliport","Platform Hermosa Heliport",34.455299377441406,-120.64700317382812,152,"NA","US","US-CA","Lompoc","no","CA00",,"CA00",,,
 16532,"CA01","heliport","Burney Sheriff's Station Heliport",40.885121,-121.669368,3127,"NA","US","US-CA","Burney","no","CA01",,"CA01",,,
@@ -32603,7 +32604,7 @@
 352480,"JO-0013","heliport","Island East Heliport",29.54052,34.98965,20,"AS","JO","JO-AQ","Aqaba","no",,,,,,
 355264,"JO-0014","heliport","Jordan Hospital Helipad",31.96089,35.89877,2939,"AS","JO","JO-AM","Amman","no",,,,,,
 509496,"JO-0015","small_airport","Al-Omari Airfield",31.568827,36.778292,,"AS","JO","JO-AM","Jizah","no",,,,,,
-322367,"JOEY","small_airport","Joeys",35.398494,-91.348252,,"NA","US","US-AR","Tupelo","no",,,,,,
+322367,"JOEY","small_airport","Joeys Field",35.398481,-91.348208,206,"NA","US","US-AR","Bradford","no",,,,,,
 302154,"JOP","small_airport","Josephstaal Airport",-4.74708333333,145.007083333,250,"OC","PG","PG-MPM","Josephstaal","no","AYJS","JOP","JSL",,,
 41849,"JP-0001","seaplane_base","JMSDF Chichijima Airfield",27.090231,142.192032,,"AS","JP","JP-13","Ogasawara","no","RJAO",,,,"https://en.wikipedia.org/wiki/Chichijima_Airfield","rjao, chichijima"
 43212,"JP-0002","heliport","Urayasu Heliport",35.623658,139.894506,16,"AS","JP","JP-12","Urayasu","no",,,,,,
@@ -36491,7 +36492,7 @@
 18750,"K3W7","small_airport","Grand Coulee Dam Airport",47.922000885,-119.083000183,1588,"NA","US","US-WA","Electric City","no","3W7","GCD","3W7","http://www.wsdot.wa.gov/aviation/AllStateAirports/ElectricCity_GrandCouleeDam.htm",,
 18751,"K3W8","small_airport","Eureka Municipal Airport",45.800523,-99.643968,1935,"NA","US","US-SD","Eureka","no","3W8",,"3W8","https://dot.sd.gov/media/documents/Eureka_3W8.pdf","https://en.wikipedia.org/wiki/Eureka_Municipal_Airport_(South_Dakota)","SD16"
 18753,"K3Y2","small_airport","George L Scott Municipal Airport",42.98509979248047,-91.79060363769531,1232,"NA","US","US-IA","West Union","no","K3Y2",,"3Y2",,,
-18754,"K3Y3","small_airport","Winterset Madison County Airport",41.362801,-94.021103,1110,"NA","US","US-IA","Winterset","no","K3Y3",,"3Y3",,"https://en.wikipedia.org/wiki/Winterset_Municipal_Airport",
+18754,"K3Y3","small_airport","Winterset Madison County Airport",41.362801,-94.021103,1110,"NA","US","US-IA","Winterset","no","3Y3",,"3Y3",,"https://en.wikipedia.org/wiki/Winterset_Municipal_Airport",
 18755,"K40","seaplane_base","Anvik Seaplane Base",62.65620040893555,-160.2050018310547,52,"NA","US","US-AK","Anvik","no","K40",,"K40",,,
 18756,"K40G","small_airport","Valle Airport",35.65060043335,-112.14800262451,5999,"NA","US","US-AZ","Grand Canyon","no","40G","VLE","40G","http://www.valleairport.com/","https://en.wikipedia.org/wiki/Valle_Airport",
 18757,"K40J","small_airport","Perry-Foley Airport",30.0693,-83.580597,44,"NA","US","US-FL","Perry","no","KFPY","FPY","FPY","http://taylorcountygov.com/airport/index.htm","https://en.wikipedia.org/wiki/Perry-Foley_Airport","40J, Perry Army Airfield"
@@ -37145,7 +37146,7 @@
 3402,"KBFL","medium_airport","Meadows Field",35.433601,-119.056999,510,"NA","US","US-CA","Bakersfield","yes","KBFL","BFL","BFL",,"https://en.wikipedia.org/wiki/Meadows_Field_Airport",
 3403,"KBFM","medium_airport","Mobile Downtown Airport",30.626800537100003,-88.06809997559999,26,"NA","US","US-AL","Mobile","no","KBFM","BFM","BFM",,"https://en.wikipedia.org/wiki/Mobile_Downtown_Airport",
 19368,"KBFR","small_airport","Virgil I Grissom Municipal Airport",38.84000015,-86.44539642,727,"NA","US","US-IN","Bedford","no","KBFR","BFR","BFR",,"https://en.wikipedia.org/wiki/Virgil_I._Grissom_Municipal_Airport",
-19369,"KBFW","closed","Silver Bay Municipal Airport",47.249001,-91.415604,1089,"NA","US","US-MN","Silver Bay","no",,,,,,"KBFW, KBFW, BFW"
+19369,"KBFW","closed","Silver Bay Municipal Airport",47.249001,-91.415604,1089,"NA","US","US-MN","Silver Bay","no",,,,,,"KBFW, BFW, Wayne Johnson Silver Bay Municipal Airport"
 19370,"KBGD","small_airport","Hutchinson County Airport",35.700901031499995,-101.393997192,3055,"NA","US","US-TX","Borger","no","KBGD","BGD","BGD","http://www.hutchinsoncountyairport.com/","https://en.wikipedia.org/wiki/Hutchinson_County_Airport",
 19371,"KBGE","small_airport","Decatur County Industrial Air Park",30.9715004,-84.63739777,141,"NA","US","US-GA","Bainbridge","no","KBGE","BGE","BGE","http://bainbridgega.com/chamber/airport.shtml","https://en.wikipedia.org/wiki/Decatur_County_Industrial_Air_Park",
 19372,"KBGF","small_airport","Winchester Municipal Airport",35.177502,-86.0662,979,"NA","US","US-TN","Winchester","no","KBGF",,"BGF",,"https://en.wikipedia.org/wiki/Winchester_Municipal_Airport",
@@ -37225,7 +37226,7 @@
 19413,"KBUB","small_airport","Cram Field",41.776699066199996,-99.14969635010002,2182,"NA","US","US-NE","Burwell","no","KBUB","BUB","BUB",,,
 3431,"KBUF","large_airport","Buffalo Niagara International Airport",42.940498,-78.732201,728,"NA","US","US-NY","Buffalo","yes","KBUF","BUF","BUF","https://www.buffaloairport.com/","https://en.wikipedia.org/wiki/Buffalo_Niagara_International_Airport",
 19414,"KBUM","small_airport","Butler Memorial Airport",38.2897987366,-94.3401031494,892,"NA","US","US-MO","Butler","no","KBUM","BUM","BUM",,,
-3432,"KBUR","medium_airport","Bob Hope Airport",34.197703,-118.356378,778,"NA","US","US-CA","Burbank","yes","KBUR","BUR","BUR","https://www.hollywoodburbankairport.com/","https://en.wikipedia.org/wiki/Hollywood_Burbank_Airport",
+3432,"KBUR","medium_airport","Hollywood Burbank Airport",34.197703,-118.356378,778,"NA","US","US-CA","Burbank","yes","KBUR","BUR","BUR","https://www.hollywoodburbankairport.com/","https://en.wikipedia.org/wiki/Hollywood_Burbank_Airport","Bob Hope"
 19415,"KBUU","small_airport","Burlington Municipal Airport",42.69070053100586,-88.30460357666016,779,"NA","US","US-WI","Burlington","no","KBUU",,"BUU",,"https://en.wikipedia.org/wiki/Burlington_Municipal_Airport_(Wisconsin)",
 19416,"KBUY","small_airport","Burlington Alamance Regional Airport",36.048500061035156,-79.47489929199219,617,"NA","US","US-NC","Burlington","no","KBUY",,"BUY",,"https://en.wikipedia.org/wiki/Burlington-Alamance_Regional_Airport",
 19417,"KBVI","medium_airport","Beaver County Airport",40.772499,-80.391403,1253,"NA","US","US-PA","Beaver Falls","no","KBVI","BFP","BVI",,"https://en.wikipedia.org/wiki/Beaver_County_Airport",
@@ -37967,7 +37968,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.0102005,-94.34259796,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","http://cityofjeffersoniowa.org/depts-airport.php",,"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"
@@ -38330,7 +38331,7 @@
 19977,"KGRE","small_airport","Greenville Airport",38.836844,-89.376525,541,"NA","US","US-IL","Greenville","no","KGRE","GRE","GRE",,"https://en.wikipedia.org/wiki/Greenville_Airport",
 3563,"KGRF","medium_airport","Gray Army Air Field",47.07920074,-122.5810013,300,"NA","US","US-WA","Fort Lewis/Tacoma","no","KGRF","GRF","GRF",,"https://en.wikipedia.org/wiki/Gray_Army_Airfield",
 3564,"KGRI","medium_airport","Central Nebraska Regional Airport",40.967498779296875,-98.30960083007812,1847,"NA","US","US-NE","Grand Island","yes","KGRI","GRI","GRI",,"https://en.wikipedia.org/wiki/Central_Nebraska_Regional_Airport",
-3565,"KGRK","medium_airport","Killeen-Fort Hood Regional Airport / Robert Gray Army Air Field",31.0672,-97.828903,1015,"NA","US","US-TX","Killeen","yes","KGRK","GRK","GRK",,"https://en.wikipedia.org/wiki/Killeen-Fort_Hood_Regional_Airport","Robert Gray Army Air Field"
+3565,"KGRK","medium_airport","Killeen Regional Airport",31.0672,-97.828903,1015,"NA","US","US-TX","Fort Cavazos","yes","KGRK","GRK","GRK",,"https://en.wikipedia.org/wiki/Killeen-Fort_Hood_Regional_Airport","Robert Gray Army Airfield, Killeen/Fort Hood Regional"
 311388,"KGRM","closed","Devil's Track Airport",47.827,-90.38,1662,"NA","US","US-MN","Grand Marias","no",,,,,,"KGRM, KGRM, GRM"
 19978,"KGRN","small_airport","Gordon Municipal Airport",42.8059997559,-102.175003052,3562,"NA","US","US-NE","Gordon","no","KGRN","GRN","GRN",,,
 3566,"KGRR","medium_airport","Gerald R. Ford International Airport",42.88079834,-85.52279663,794,"NA","US","US-MI","Grand Rapids","yes","KGRR","GRR","GRR",,"https://en.wikipedia.org/wiki/Gerald_R._Ford_International_Airport",
@@ -38893,7 +38894,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","KM21",,"M21",,,
+20417,"KM21","small_airport","Muhlenberg County Airport",37.225966,-87.156987,422,"NA","US","US-KY","Greenville","no","M21",,"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",,,
@@ -39290,7 +39291,7 @@
 20707,"KO88","small_airport","Rio Vista Municipal Airport",38.19340133666992,-121.7040023803711,20,"NA","US","US-CA","Rio Vista","no","KO88",,"O88",,"https://en.wikipedia.org/wiki/Rio_Vista_Municipal_Airport",
 20708,"KO89","small_airport","Fall River Mills Airport",41.018798828125,-121.43299865722656,3323,"NA","US","US-CA","Fall River Mills","no","KO89",,"O89",,"https://en.wikipedia.org/wiki/Fall_River_Mills_Airport",
 20709,"KOAJ","medium_airport","Albert J Ellis Airport",34.829201,-77.612099,94,"NA","US","US-NC","Richlands","yes","KOAJ","OAJ","OAJ","https://flyoaj.com/","https://en.wikipedia.org/wiki/Albert_J._Ellis_Airport",
-3744,"KOAK","large_airport","Metropolitan Oakland International Airport",37.720085,-122.221184,9,"NA","US","US-CA","Oakland","yes","KOAK","OAK","OAK","http://www.oaklandairport.com/","https://en.wikipedia.org/wiki/Oakland_International_Airport","QSF, QBA"
+3744,"KOAK","large_airport","San Francisco Bay Oakland International Airport",37.720085,-122.221184,9,"NA","US","US-CA","Oakland","yes","KOAK","OAK","OAK","http://www.oaklandairport.com/","https://en.wikipedia.org/wiki/Oakland_International_Airport","Metro Oakland International"
 20710,"KOAR","small_airport","Marina Municipal Airport",36.68190002,-121.762001,137,"NA","US","US-CA","Marina","no","KOAR","OAR","OAR",,"https://en.wikipedia.org/wiki/Marina_Municipal_Airport","Fritzsche AAF"
 20711,"KOBE","small_airport","Okeechobee County Airport",27.262800216699997,-80.8498001099,34,"NA","US","US-FL","Okeechobee","no","KOBE","OBE","OBE",,"https://en.wikipedia.org/wiki/Okeechobee_County_Airport",
 18497,"KOBI","small_airport","Woodbine Municipal Airport",39.2192,-74.7948,42,"NA","US","US-NJ","Woodbine","no","KOBI",,"OBI",,"https://en.wikipedia.org/wiki/Woodbine_Municipal_Airport_(New_Jersey)","Formerly 1N4"
@@ -41253,7 +41254,7 @@
 21297,"KUNI","small_airport","Ohio University Airport",39.211839,-82.22949,766,"NA","US","US-OH","Albany","no","KUNI","ATO","UNI",,"https://en.wikipedia.org/wiki/Gordon_K._Bush_Airport","Athens, Gordon K Bush Airport, Snyder Field"
 21298,"KUNO","small_airport","West Plains Regional Airport",36.878399,-91.902702,1228,"NA","US","US-MO","Pomona","no","KUNO",,"UNO",,"https://en.wikipedia.org/wiki/West_Plains_Regional_Airport",
 21299,"KUNU","small_airport","Dodge County Airport",43.42660141,-88.70320129,934,"NA","US","US-WI","Juneau","no","KUNU","UNU","UNU","http://www.co.dodge.wi.us/index.aspx?page=44","https://en.wikipedia.org/wiki/Dodge_County_Airport",
-21300,"KUNV","medium_airport","University Park Airport",40.849374,-77.84852,1239,"NA","US","US-PA","State College","yes","KUNV","SCE","UNV","http://universityparkairport.com/","https://en.wikipedia.org/wiki/University_Park_Airport",
+21300,"KUNV","medium_airport","State College Regional Airport",40.849374,-77.84852,1239,"NA","US","US-PA","State College","yes","KUNV","SCE","UNV","http://universityparkairport.com/","https://en.wikipedia.org/wiki/University_Park_Airport","University Park"
 21301,"KUOS","small_airport","Franklin County Airport",35.204754,-85.899052,1953,"NA","US","US-TN","Sewanee","no","KUOS","UOS","UOS",,"https://en.wikipedia.org/wiki/Franklin_County_Airport_(Tennessee)","Sewanee International"
 3942,"KUOX","medium_airport","University Oxford Airport",34.384300231934,-89.536796569824,452,"NA","US","US-MS","Oxford","no","KUOX","UOX","UOX","http://airport.olemiss.edu/","https://en.wikipedia.org/wiki/University-Oxford_Airport",
 313569,"KUP","small_airport","Kupiano Airport",-10.0736,148.218,90,"OC","PG","PG-CPM","Kupiano","no",,"KUP","KPN",,,
@@ -43872,7 +43873,7 @@
 21746,"M61","small_airport","Edward F Johnson Airport",46.3452,-87.788498,1446,"NA","US","US-MI","Ishpeming","no","M61",,"M61",,"https://en.wikipedia.org/wiki/Edward_F_Johnson_Airport",
 21747,"M62","heliport","Rotorcraft Heliport",46.206699,-114.153,3630,"NA","US","US-MT","Hamilton","no","M62",,"M62",,,
 21748,"M69","seaplane_base","Birch Lake Seaplane Base",46.36970138549805,-93.81390380859375,1278,"NA","US","US-MN","Deerwood","no","M69",,"M69",,,
-21749,"M74","small_airport","Bald Knob Municipal Airport",35.30039978027344,-91.55760192871094,212,"NA","US","US-AR","Bald Knob","no","M74",,"M74",,,
+21749,"M74","small_airport","Bald Knob Municipal Airport",35.3004,-91.557602,212,"NA","US","US-AR","Bald Knob","no","KM74",,"M74",,,
 21750,"M84","closed","Erie Aerodrome",41.782961,-83.51753,605,"NA","US","US-MI","Erie","no",,,,,"https://en.wikipedia.org/wiki/Erie_Aerodrome","M84"
 21751,"M86","small_airport","Walle Field",42.47090148925781,-86.1272964477539,635,"NA","US","US-MI","Pullman","no","M86",,"M86",,,
 45427,"M97","small_airport","Morehead-Rowan County Clyde A. Thomas Regional Airport",38.215,-83.587611,1028,"NA","US","US-KY","Morehead","no","KSYM",,"SYM","http://mrcairport.org/","https://en.wikipedia.org/wiki/Morehead-Rowan_County_Clyde_A._Thomas_Regional_Airport","M97"
@@ -44913,7 +44914,7 @@
 22218,"MO14","small_airport","Marshall Field",37.422778,-93.208611,1166,"NA","US","US-MO","Fair Grove","no","MO14",,"MO14",,,
 22219,"MO15","closed","Beckner Field",37.387501,-92.957397,1285,"NA","US","US-MO","Marshfield","no",,,,,,"MO15"
 22220,"MO16","small_airport","Baugh Flight Park Ultralightport",37.16389846801758,-94.16829681396484,984,"NA","US","US-MO","Avilla","no","MO16",,"MO16",,,
-22221,"MO17","small_airport","Garst Airport",40.47919845581055,-95.64610290527344,905,"NA","US","US-MO","Watson","no","MO17",,"MO17",,,
+22221,"MO17","small_airport","Garst Airport",40.480353,-95.648549,905,"NA","US","US-MO","Watson","no","MO17",,"MO17",,,
 22222,"MO18","closed","Clevenger Airport",38.947201,-94.2491,990,"NA","US","US-MO","Blue Springs","no",,,,,,"MO18"
 22223,"MO19","heliport","American Legion-Village of Centertown Heliport",38.61309814453125,-92.41210174560547,805,"NA","US","US-MO","Centertown","no","MO19",,"MO19",,,
 22224,"MO2","small_airport","Flying Bar H Ranch Airport",37.175201,-93.128899,1375,"NA","US","US-MO","Rogersville","no","KMO2",,"MO2",,,
@@ -45214,7 +45215,7 @@
 22323,"MS19","heliport","Pascagoula Refinery Pad Nr 2 Heliport",30.354900360107422,-88.49140167236328,20,"NA","US","US-MS","Pascagoula","no","MS19",,"MS19",,,
 22324,"MS20","closed","Newell Flying Service Airport",33.354801,-90.579002,126,"NA","US","US-MS","Inverness","no",,,,,,"MS20"
 22325,"MS21","small_airport","Lester Field",33.3321,-90.582001,115,"NA","US","US-MS","Inverness","no","MS21",,"MS21",,,"Gary Flying Services, Mark Gary Flying Service"
-22326,"MS22","small_airport","Murphey Flying Service Airport",33.48899841308594,-90.35700225830078,120,"NA","US","US-MS","Itta Bena","no","MS22",,"MS22",,,
+22326,"MS22","closed","Murphey Flying Service Airport",33.488998,-90.357002,120,"NA","US","US-MS","Itta Bena","no",,,,,,"MS22"
 22327,"MS23","closed","Forest Home Airport",31.006701,-91.203102,240,"NA","US","US-MS","Woodville","no",,,,,,"MS23"
 22328,"MS24","small_airport","Joe Sanford Field",32.24679946899414,-90.5822982788086,180,"NA","US","US-MS","Edwards","no","MS24",,"MS24",,,
 22329,"MS25","closed","Huntley Airport",33.398912,-90.967036,117,"NA","US","US-MS","Leland","no",,,,,,"MS25"
@@ -52440,6 +52441,8 @@
 535423,"PH-0597","closed","Punta Baja Airfield",9.0614,117.65386,,"AS","PH","PH-PLW","Rizal","no",,,,,,
 537863,"PH-0598","small_airport","URC Tolong Airstrip",9.35211,122.84822,33,"AS","PH","PH-NER","Santa Catalina","no",,,,,,"Caranoche"
 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",,,,,,
 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"
@@ -57000,8 +57003,8 @@
 35659,"SDON","heliport","Ônix Helipad",-23.551563,-46.722272,2634,"SA","BR","BR-SP","São Paulo","no","SDON",,"SP0397",,,
 332063,"SDOO","heliport","Órion Helipad",-16.696888,-49.269783,3090,"SA","BR","BR-GO","Goiânia","no","SDOO",,"GO0155",,,
 35660,"SDOP","heliport","ESM/Sigma Pharma 2 Helipad",-22.895864,-47.190534,2126,"SA","BR","BR-SP","Hortolândia","no","SDOP",,"SP0398",,,
-327007,"SDOQ","small_airport","Fazenda Campo Claro Airstrip",-12.674353,-51.739294,1165,"SA","BR","BR-MT","Ribeirão Cascalheira","no","SDOQ",,,,,
-35661,"SDOR","small_airport","Fazenda Mosquito Airport",-20.747222900390625,-47.88972091674805,2415,"SA","BR","BR-SP","Orlândia","no","SDOR",,,,,
+327007,"SDOQ","small_airport","Fazenda Campo Claro Airstrip",-12.674353,-51.739294,1135,"SA","BR","BR-MT","Ribeirão Cascalheira","no","SDOQ",,"MT0051",,,
+35661,"SDOR","small_airport","Fazenda Mosquito Airport",-20.747394,-47.889806,2415,"SA","BR","BR-SP","Orlândia","no","SDOR",,"SP0131",,,
 35662,"SDOS","closed","Issac Heliport",-23.909400939941406,-46.167198181152344,39,"SA","BR","BR-SP","Guarujá","no",,,,,,"SDOS, SDOS"
 35663,"SDOT","heliport","Attilio Tinelli Heliport",-23.59861183166504,-46.69388961791992,2559,"SA","BR","BR-SP","São Paulo","no","SDOT",,,,,
 192,"SDOU","small_airport","Jornalista Benedito Pimentel Airport",-22.966598,-49.912049,1516,"SA","BR","BR-SP","Ourinhos","no","SDOU","OUS","SP0023",,"https://en.wikipedia.org/wiki/Ourinhos_Airport",
@@ -57352,11 +57355,11 @@
 35831,"SDZR","small_airport","Fazenda Cruzeiro Airport",-21.412221908569336,-48.328609466552734,2116,"SA","BR","BR-SP","Guariba","no","SDZR",,,,,
 220,"SDZS","small_airport","Fazenda Bananeira Airport",-20.579999923706,-49.079700469971,1673,"SA","BR","BR-SP","Altair","no",,,"SDZS",,,"SDZS"
 35832,"SDZT","small_airport","Fazenda Posses do Rio Grande Airport",-20.310832977295,-48.976943969727,1581,"SA","BR","BR-SP","Guaraci","no",,,,,,"SDZT"
-35833,"SDZU","small_airport","Fazenda Anhumas Airport",-22.122499465900002,-52.1977767944,1001,"SA","BR","BR-SP","Marabá Paulista","no","SDZU",,,,,
+35833,"SDZU","small_airport","Fazenda Anhumas Airport",-22.121936,-52.19793,1001,"SA","BR","BR-SP","Marabá Paulista","no","SDZU",,"SP0168",,,
 35834,"SDZV","small_airport","Fazenda Gandu Airport",-22.476110458374,-49.470001220703,1841,"SA","BR","BR-SP","Duartina","no",,,,,,"SDZV"
 35835,"SDZW","small_airport","Fazenda Ipanema Airport",-20.811666488647,-51.294166564941,1181,"SA","BR","BR-SP","Andradina","no",,,,,,"SDZW"
-46189,"SDZX","small_airport","Fazenda Suri Airport",-14.815556,-53.133056,1050,"SA","BR","BR-MT","Campinápolis","no","SDZX",,"SDZX",,,
-35837,"SDZZ","small_airport","Sítio São José Airport",-21.79777717590332,-48.543888092041016,1790,"SA","BR","BR-SP","Nova Europa","no","SDZZ",,,,,
+46189,"SDZX","small_airport","Fazenda Suri Airport",-14.813348,-53.124617,1250,"SA","BR","BR-MT","Campinápolis","no","SDZX",,"MT0076",,,
+35837,"SDZZ","small_airport","Sítio São José Airport",-21.798767,-48.544439,1788,"SA","BR","BR-SP","Nova Europa","no","SDZZ",,"SP0169",,,
 42718,"SE-0001","small_airport","Trosa Troslanda airfield",58.898617,17.498474,26,"EU","SE","SE-D",,"no",,,,"http://www.trosaflygklubb.se/",,
 42719,"SE-0002","small_airport","Stegeborg",58.433696,16.606826,7,"EU","SE","SE-E",,"no","ESVE",,,"https://web.archive.org/web/20080906220902/http://www.stegeborg.se:80/flygfalt.html",,
 42720,"SE-0003","small_airport","Bollnäs",61.356201171875,16.328800201416016,270,"EU","SE","SE-X","Bollnäs","no",,,,"http://www.bollnasflygklubb.se/flygf%C3%A4ltsinformation2",,
@@ -58277,6 +58280,9 @@
 335347,"SIEX","small_airport","Fazenda São Joaquim I Airport",-19.010015,-50.431983,1450,"SA","BR","BR-MG","Santa Vitória","no","SIEX",,"MG0098",,,
 35946,"SIEY","heliport","Palácio das Mangabeiras Heliport",-19.953755,-43.912665,3825,"SA","BR","BR-MG","Belo Horizonte","no","SIEY",,"MG0225",,,
 35947,"SIEZ","small_airport","Fazenda Pedra Branca Airport",-24.624166488647,-50.459167480469,2953,"SA","BR","BR-PR","Tibagi","no",,,,,,"SIEZ"
+538598,"SIF2","small_airport","Fazenda Porto d'Oeste Airport",-14.340083,-60.190672,650,"SA","BR","BR-MT","Vila Bela da Santíssima Trindade","no","SIF2",,"MT0963",,,
+538602,"SIF3","small_airport","Fazenda Tremendal Airport",-16.456095,-58.292987,374,"SA","BR","BR-MT","Cáceres","no","SIF3",,"MT0873",,,
+538593,"SIF4","heliport","Grand Brasil Helipad",-23.503298,-46.856227,2528,"SA","BR","BR-SP","Barueri","no","SIF4",,"SP1424",,,
 35948,"SIFA","small_airport","Fazenda Sete Airport",-19.791055,-56.476336,328,"SA","BR","BR-MS","Aquidauana","no","SJZ9",,"MS0078",,,"SIFA, Miranda"
 35949,"SIFB","heliport","Sítio Canhanheiro Heliport",-23.22358,-44.685366,7,"SA","BR","BR-RJ","Parati","no","SIFB",,"RJ0075",,,
 35950,"SIFC","small_airport","Fazenda Cachoeirinha Airport",-20.382221221924,-56.268890380859,722,"SA","BR","BR-MS","Miranda","no",,,,,,"SIFC"
@@ -66218,19 +66224,19 @@
 324422,"US-0338","small_airport","Brown's Homestead Airport",61.472911,-149.98245,140,"NA","US","US-AK","Big Lake","no","95AK",,"95AK",,,
 321792,"US-0339","small_airport","In the Air Boys Airport",31.584173,-100.559373,2003,"NA","US","US-TX","Grape Creek","no",,,,,,"Cloud Country"
 321829,"US-0340","small_airport","Freps Airport",35.298118,-91.582508,215,"NA","US","US-AR","Bald Knob","no",,,,,,
-321830,"US-0341","small_airport","FFS Field",35.284432,-91.535999,210,"NA","US","US-AR","Bald Knob","no",,,"FFS",,,
-321831,"US-0342","small_airport","Jps Field",35.295401,-91.578227,210,"NA","US","US-AR","Bald Knob, AR","no",,,"JPS",,,
+321830,"US-0341","small_airport","FFS Field",35.284432,-91.535999,210,"NA","US","US-AR","Bald Knob","no",,,,,,
+321831,"US-0342","small_airport","JP's Field",35.295243,-91.578366,210,"NA","US","US-AR","Bald Knob","no",,,,,,
 321833,"US-0343","small_airport","Tuckers Field",35.64057,-91.865896,1020,"NA","US","US-AR","Concord","no",,,"TUCK",,,
 321834,"US-0344","small_airport","Elvis1 Field",35.217525,-91.647637,220,"NA","US","US-AR","Griffithville","no",,,,,,"ELVIS1"
 321837,"US-0345","small_airport","Cash Field",35.800059,-91.030442,250,"NA","US","US-AR","Cash","no",,,,,,"CASH"
 321838,"US-0346","small_airport","Barbers Lake Field",35.160699,-91.53301,200,"NA","US","US-AR","Georgetown","no",,,,,,"BARBERL"
 321839,"US-0347","small_airport","Falwell Railroad Field",35.551564,-91.363072,200,"NA","US","US-AR","Newport","no",,,,,,"FALRR"
-321841,"US-0348","small_airport","Aubry Field",34.71968,-90.891562,180,"NA","US","US-AR","Aubrey","no",,,"AUBRY",,,
-321842,"US-0349","small_airport","Aubry Field2",34.714668,-90.914616,180,"NA","US","US-AR","Aubrey","no",,,"AUBRY2",,,
+321841,"US-0348","small_airport","Aubrey Field",34.71968,-90.891562,180,"NA","US","US-AR","Aubrey","no",,,,,,
+321842,"US-0349","small_airport","Aubrey Field Number 2",34.714601,-90.914176,180,"NA","US","US-AR","Aubrey","no",,,,,,
 321843,"US-0350","small_airport","Bennetts Field",35.27687,-91.484762,210,"NA","US","US-AR","Worden","no",,,,,,
-321848,"US-0351","small_airport","Collisons Field",35.32093,-91.512721,220,"NA","US","US-AR","Bald Knob","no",,,"COLLISO",,,
+321848,"US-0351","small_airport","Collisons Field",35.32093,-91.512721,220,"NA","US","US-AR","Bald Knob","no",,,,,,
 321854,"US-0352","small_airport","England Flying Service Airport",34.544423,-91.979719,230,"NA","US","US-AR","England","no",,,"5MZ",,,
-321855,"US-0353","small_airport","Buds Field",35.316699,-91.462707,205,"NA","US","US-AR","Russell","no",,,"BUDS",,,
+321855,"US-0353","small_airport","Buds Field",35.316699,-91.462707,205,"NA","US","US-AR","Russell","no",,,,,,
 321856,"US-0354","small_airport","McConnaughhay's Field",35.097259,-91.642198,215,"NA","US","US-AR","Griffithville","no",,,,,,"KENS"
 321858,"US-0355","small_airport","Reapers Field",35.327459,-91.803972,270,"NA","US","US-AR","Albion","no",,,"REAPERS",,,
 321859,"US-0356","small_airport","Tupelo Field",35.41211,-91.231098,217,"NA","US","US-AR","Tupelo","no",,,"TUPELO",,,
@@ -74671,6 +74677,37 @@
 538149,"US-8776","closed","Dudden Airport",40.77025,-102.0462,3603,"NA","US","US-NE","Venango","no",,,,,,
 538207,"US-8777","closed","Lake McConaughy Airport",41.23972,-101.85472,3280,"NA","US","US-NE","Brule","no",,,,,,
 538385,"US-8778","closed","Fairground Heliport",35.475833,-97.569722,1290,"NA","US","US-OK","Oklahoma City","no",,,,,,"1O9"
+538523,"US-8779","closed","Grundman Airport",40.65937,-95.86265,1085,"NA","US","US-NE","Nebraska City","no",,,,,,
+538526,"US-8780","closed","Roll Airport",40.64292,-95.82426,1080,"NA","US","US-NE","Nebraska City","no",,,,,,
+538530,"US-8781","small_airport","Calder Airport",47.26985,-116.17795,2118,"NA","US","US-ID","Calder","no",,,,,,
+538533,"US-8782","closed","Hood Farms Airport",33.98051,-90.91111,156,"NA","US","US-MS","Gunnison","no",,,,,,
+538534,"US-8783","closed","Coldwater Municipal Airfield",34.6869,-89.98936,250,"NA","US","US-MS","Coldwater","no",,,,,,
+538537,"US-8784","small_airport","Lettie's Landing",45.72,-121.06,1775,"NA","US","US-WA",,"no",,,,,,"Private"
+538539,"US-8785","small_airport","Balch Lake",45.717,-121.32471,807,"NA","US","US-WA",,"no",,,,,,"Private"
+538545,"US-8786","small_airport","Runsick Flying Service Earle Airport",35.34058,-90.56155,211,"NA","US","US-AR","Earle","no",,,,,,
+538546,"US-8787","small_airport","Kimbrough Field",33.43546,-90.30252,124,"NA","US","US-MS","Itta Bena","no",,,,,,
+538547,"US-8788","small_airport","H&M Flying Service Airport",35.7813,-89.91842,241,"NA","US","US-AR","Luxora","no",,,,,,
+538548,"US-8789","closed","Wesson Airport",35.76293,-90.06099,233,"NA","US","US-AR","Osceola","no",,,,,,
+538550,"US-8790","closed","Risco Airport",36.53697,-89.77434,274,"NA","US","US-MO","Catron","no",,,,,,
+538551,"US-8791","closed","Macedonia Airport",34.57193,-91.1821,177,"NA","US","US-AR","Holly Grove","no",,,,,,
+538552,"US-8792","closed","Cross Roads Airport",34.43329,-91.06268,163,"NA","US","US-AR","Holly Grove","no",,,,,,
+538553,"US-8793","closed","Marvell Airport",34.56609,-90.9144,194,"NA","US","US-AR","Marvell","no",,,,,,
+538555,"US-8794","closed","Boone Lake Airport",34.06831,-91.59511,177,"NA","US","US-AR","Gould","no",,,,,,
+538556,"US-8795","closed","Big Piney Creek Airport",34.76138,-91.07876,183,"NA","US","US-AR","Moro","no",,,,,,
+538557,"US-8796","small_airport","Moro Strip",34.766178,-91.056922,184,"NA","US","US-AR","Moro","no",,,,,,
+538558,"US-8797","closed","Thomasville Airport",34.74228,-90.94429,203,"NA","US","US-AR","Marianna","no",,,,,,
+538560,"US-8798","closed","New Salem Airport",34.86305,-90.99235,203,"NA","US","US-AR","Moro","no",,,,,,
+538561,"US-8799","small_airport","Wolf Pen Slough Airport",35.40518,-90.85195,234,"NA","US","US-AR","Cherry Valley","no",,,,,,
+538562,"US-8800","small_airport","J Harmon Flying Services Airport",35.81894,-90.52166,237,"NA","US","US-AR","Jonesboro","no",,,,,,
+538563,"US-8801","small_airport","Promise Land Farms Airport",36.02707,-90.41881,244,"NA","US","US-AR","Paragould","no",,,,,,
+538564,"US-8802","small_airport","Columbus Air Service Airport",33.78116,-90.77511,137,"NA","US","US-MS","Cleveland","no",,,,,,"Needmo Farms"
+538565,"US-8803","small_airport","North Delta Ag Aviation Airport",34.43537,-90.28262,171,"NA","US","US-MS","Falcon","no",,,,,,
+538566,"US-8804","small_airport","Wildwood Airport",35.00916,-90.47688,201,"NA","US","US-AR","Heth","no",,,,,,
+538567,"US-8805","closed","Former Ely Municipal Airport",47.896,-91.836,1426,"NA","US","US-MN","Ely","no",,,,,,
+538568,"US-8806","closed","Coleraine Airport",47.2803,-93.42788,1368,"NA","US","US-MN","Coleraine","no",,,,,,
+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",,,,,,
 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"
@@ -75869,7 +75906,7 @@
 504741,"VN-0052","heliport","Bãi Vũng Mây 2 (Kingston Shoal) Helipad",7.5348,111.54725,,"AS","VN","VN-SCC","Trường Sa (Trường Sa)","no",,,,,,
 504742,"VN-0053","heliport","Bãi Vũng Mây 3 (Bombay Castle Shoal) Helipad",7.875317,111.744572,,"AS","VN","VN-SCC","Trường Sa (Trường Sa)","no",,,,,,
 506005,"VN-0054","closed","Phi Trường Nước Trong (cũ)",10.83481,106.959386,,"AS","VN","VN-U-A",,"no",,,,,,
-537582,"VN-0055","large_airport","KUBET77 MEME",80.875207,150,,"AS","VN","VN-NE",,"yes",,,,,,
+537582,"VN-0055","large_airport","SPAM",0.08,0.05,,"AS","VN","VN-NE",,"yes",,,,,,
 517873,"VN-0057","medium_airport","Sân bay Topnhacaiuytin",58,172,5679,"AS","VN","VN-SW","Hà nội","no",,,,,,
 530767,"VN-0067","small_airport","888Bet",12,12,,"AS","VN","VN-U-A","Tân An","no",,,"2423",,,
 534389,"VN-0068","medium_airport","kqxsstudio",55,56,,"AS","VN","VN-CH",,"no",,,,,,
diff --git a/runways.csv b/runways.csv
index 2669b606c..e6f4d5850 100644
--- a/runways.csv
+++ b/runways.csv
@@ -34568,7 +34568,7 @@
 264458,30211,"SDOL",3609,59,"ASP",1,0,"01",,,,,,"19",,,,,
 262720,35659,"SDON",59,59,"CON",0,0,"16",,,,,,"34",,,,,
 263360,35660,"SDOP",66,66,"MET",0,0,"9",,,,,,"36",,,,,
-327008,327007,"SDOQ",3609,66,"GRE",0,0,"10",,,,,,"28",,,,,
+327008,327007,"SDOQ",3609,66,"Earth",0,0,"12",,,,,,"30",,,,,
 262262,35661,"SDOR",2953,79,"GRE",0,0,"16",,,,,,"34",,,,,
 262776,35663,"SDOT",62,62,"CON",0,0,"2",,,,,,"29",,,,,
 234081,192,"SDOU",4921,98,"ASP",0,0,"16",,,,,,"34",,,,,
@@ -34886,11 +34886,11 @@
 262184,35831,"SDZR",2789,82,"GRE",0,0,"3",,,,,,"21",,,,,
 233932,220,"SDZS",4265,66,"ASP",0,0,"16",,,,,,"34",,,,,
 260579,35832,"SDZT",2953,75,"GRS",0,0,"9",,,,,,"27",,,,,
-262254,35833,"SDZU",2953,82,"GRE",0,0,"14",,,,,,"32",,,,,
+262254,35833,"SDZU",2953,59,"ASP",0,0,"15",,,,,,"33",,,,,
 260881,35834,"SDZV",2789,66,"GRS",0,0,"1",,,,,,"19",,,,,
 261074,35835,"SDZW",3366,75,"GRS",0,0,"10",,,,,,"28",,,,,
 269365,46189,"SDZX",4265,59,"GRASS",0,0,"10",,,,,,"28",,,,,
-260713,35837,"SDZZ",2297,105,"GRS",0,0,"1",,,,,,"19",,,,,
+260713,35837,"SDZZ",1919,66,"GRS",0,0,"02",,,,,,"20",,,,,
 300954,42718,"SE-0001",2164,82,"Grass",0,0,"12",,,,,,"30",,,,,
 506522,42719,"SE-0002",2624,90,"GRASS",0,0,"07",,,6,,,"25",,,6,,
 271028,46509,"SE-0004",2500,50,"Pavement",1,0,"01",,,650,,,"19",,,625,,
@@ -35432,6 +35432,9 @@
 260967,35945,"SIEV",3051,75,"GRS",0,0,"15",,,,,,"33",,,,,
 262987,35946,"SIEY",69,69,"CON",0,0,"10",,,,,,"28",,,,,
 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",,,,,,,,,,,
 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",,,,,