diff --git a/airports.csv b/airports.csv
index d9a256978..517c02e38 100644
--- a/airports.csv
+++ b/airports.csv
@@ -4969,7 +4969,7 @@
 10899,"3XS8","small_airport","Ken Ada Ranch Airport",30.137034,-95.917643,250,"NA","US","US-TX","Waller","no","3XS8",,"3XS8",,,
 10900,"3XS9","heliport","Comanche Hospital Heliport",31.896299362182617,-98.60540008544922,1422,"NA","US","US-TX","Comanche","no","3XS9",,"3XS9",,,
 10901,"3Y0","small_airport","Wall Lake Municipal Airport",42.26240158081055,-95.0906982421875,1224,"NA","US","US-IA","Wall Lake","no","3Y0",,"3Y0",,,
-10902,"3Y4","small_airport","Woodbine Municipal Airport",41.736099,-95.683601,1068,"NA","US","US-IA","Woodbine","no","3Y4",,"3Y4",,"https://en.wikipedia.org/wiki/Woodbine_Municipal_Airport_(Iowa)",
+10902,"3Y4","small_airport","Woodbine Municipal Airport",41.736099,-95.683601,1068,"NA","US","US-IA","Woodbine","no","K3Y4",,"3Y4",,"https://en.wikipedia.org/wiki/Woodbine_Municipal_Airport_(Iowa)",
 10903,"3Y7","small_airport","Isabel Municipal Airport",45.389806,-101.437656,2398,"NA","US","US-SD","Isabel","no","3Y7",,"3Y7",,,"SD26"
 10904,"3Z1","small_airport","Feather River Airport",64.83170318603516,-166.1320037841797,325,"NA","US","US-AK","Feather River","no","3Z1",,"3Z1",,,
 10905,"3Z8","seaplane_base","Golden Horn Lodge Seaplane Base",59.7470016479,-158.875,91,"NA","US","US-AK","Golden Horn Lodge","no","3Z8","GDH","3Z8",,,
@@ -5949,7 +5949,7 @@
 11729,"4TE9","small_airport","Squirrel Creek Ranch Airport",29.26409912109375,-99.35060119628906,970,"NA","US","US-TX","D'Hanis","no","4TE9",,"4TE9",,,
 11730,"4TN0","small_airport","Melton Field",36.15190124511719,-83.73280334472656,1060,"NA","US","US-TN","Blaine","no","4TN0",,"4TN0",,,
 11731,"4TN1","closed","TGP Station 555 Heliport",35.025101,-87.757797,874,"NA","US","US-TN","Collinwood","no",,,,,,"4TN1"
-11732,"4TN2","small_airport","Buck Creek Ranch Airport",35.883399963378906,-84.96880340576172,1800,"NA","US","US-TN","Crossville","no","4TN2",,"4TN2",,,
+11732,"4TN2","small_airport","Buck Creek Ranch Airport",35.88336,-84.96953,1800,"NA","US","US-TN","Crossville","no","4TN2",,"4TN2",,,
 11733,"4TN3","small_airport","Hawks Nest Airport",35.11830139160156,-89.3677978515625,410,"NA","US","US-TN","Moscow","no","4TN3",,"4TN3",,,
 11734,"4TN4","small_airport","Cotton Field",35.189998626708984,-89.63860321044922,345,"NA","US","US-TN","Eads","no","4TN4",,"4TN4",,,
 11735,"4TN5","closed","TGP Station 860 Heliport",35.847801,-87.449501,760,"NA","US","US-TN","Fairfield","no",,,,,,"4TN5"
@@ -8042,7 +8042,7 @@
 13551,"6TE8","small_airport","Douglas Flying Service Private Airport",33.17042,-100.217092,1743,"NA","US","US-TX","Aspermont","no","6TE8",,"6TE8",,,
 13552,"6TE9","small_airport","Mc Kenzie Field",32.816799163800006,-94.616897583,360,"NA","US","US-TX","Avinger","no","6TE9",,"6TE9",,,
 13553,"6TN0","heliport","Waldens Creek Heliport",35.790401458740234,-83.60679626464844,1000,"NA","US","US-TN","Pigeon Forge","no","6TN0",,"6TN0",,,
-13554,"6TN1","small_airport","Weakleys Field",36.40620041,-87.0821991,705,"NA","US","US-TN","Pleasantview","no","6TN1",,"6TN1",,,
+13554,"6TN1","small_airport","Weakleys Field",36.4062,-87.082199,705,"NA","US","US-TN","Chapmansboro","no","6TN1",,"6TN1",,,"Pleasantview"
 13555,"6TN2","heliport","Hawkins County Memorial Hospital Heliport",36.40039825439453,-83.018798828125,1250,"NA","US","US-TN","Rogersville","no","6TN2",,"6TN2",,,
 13556,"6TN3","heliport","Sixty Six Heliport",35.89590072631836,-83.5781021118164,1010,"NA","US","US-TN","Sevierville","no","6TN3",,"6TN3",,,
 13557,"6TN4","small_airport","The Aviation Valley Airport",35.421902,-86.290298,890,"NA","US","US-TN","Wartrace","no","6TN4",,"6TN4",,,
@@ -9753,7 +9753,7 @@
 15014,"8LL8","heliport","Miners Memorial Health Center Heliport",37.8993988,-88.9539032,402,"NA","US","US-IL","West Frankfort","no","8LL8",,"8LL8",,,
 15015,"8M2","small_airport","Sally Wofford Airport",35.590302,-90.913696,245,"NA","US","US-AR","Weiner","no","8M2",,"8M2",,"https://en.wikipedia.org/wiki/Sally_Wofford_Airport",
 15016,"8M6","small_airport","McVille Municipal Airport",47.770474,-98.184855,1473,"NA","US","US-ND","McVille","no","K8M6",,"8M6",,"https://en.wikipedia.org/wiki/McVille_Municipal_Airport",
-15017,"8M7","small_airport","Tradewater Airport",37.188899993896484,-87.67500305175781,405,"NA","US","US-KY","Dawson Springs","no","8M7",,"8M7",,,
+15017,"8M7","small_airport","Tradewater Airport",37.18595,-87.67503,405,"NA","US","US-KY","Dawson Springs","no","K8M7",,"8M7",,,
 316954,"8MA4","small_airport","Crow Island Airport (Pvt)",42.417222,-71.494444,185,"NA","US","US-MA","Stow","no","8MA4",,"8MA4","http://www.crowislandairpark.com/","https://en.wikipedia.org/wiki/Crow_Island_Airport",
 15018,"8MD0","small_airport","Suzie Field",39.376996,-77.017164,560,"NA","US","US-MD","Woodbine","no","8MD0",,"8MD0",,,
 15019,"8MD1","heliport","Rite Aid Distribution Center Heliport",39.454036,-76.209286,35,"NA","US","US-MD","Aberdeen","no","8MD1",,"8MD1",,,
@@ -10940,7 +10940,7 @@
 16025,"9WA0","heliport","Boeing Plant 2 Heliport",47.536747,-122.313441,17,"NA","US","US-WA","Seattle","no","9WA0",,"9WA0",,,
 16026,"9WA1","heliport","Quincy Valley Hospital Ems Heliport",47.230501,-119.867674,1260,"NA","US","US-WA","Quincy","no","9WA1",,"9WA1",,,
 16027,"9WA2","heliport","Odessa Memorial Hospital Heliport",47.331446,-118.682299,1700,"NA","US","US-WA","Odessa","no","9WA2",,"9WA2",,,
-16028,"9WA3","small_airport","River Bend Airport",48.469600677490234,-117.29000091552734,2040,"NA","US","US-WA","River Bend Lodge","no","9WA3",,"9WA3",,,
+16028,"9WA3","closed","River Bend Airport",48.469601,-117.290001,2040,"NA","US","US-WA","Cusick","no",,,,,,"9WA3"
 16029,"9WA4","small_airport","Piper Canyon Airport",45.810391,-120.952851,1610,"NA","US","US-WA","Goldendale","no","9WA4",,"9WA4",,,
 16030,"9WA5","heliport","Mid-Valley Hospital EMS Heliport",48.397229,-119.547837,800,"NA","US","US-WA","Omak","no","9WA5",,"9WA5",,,
 16031,"9WA6","heliport","Puget Sound Plaza Heliport",47.60847,-122.33573,670,"NA","US","US-WA","Seattle","no","9WA6",,"9WA6",,,
@@ -15378,7 +15378,7 @@
 337774,"BR-1263","heliport","Planalto Indústria Mecânica Heliport",-16.653264,-49.345238,2139,"SA","BR","BR-GO","Goiânia","no",,,,,,"SJPI"
 337775,"BR-1264","small_airport","Pista do Limão",-5.745327,-56.388601,554,"SA","BR","BR-PA","Itaituba","no","SJPL",,"PA0074",,,
 337777,"BR-1265","heliport","Jundiá Heliport",-22.40108,-41.875688,89,"SA","BR","BR-RJ","Macaé","no","SJPN",,"RJ0110",,,
-337778,"BR-1266","heliport","Terminal Petrobrás - São Sebastião Heliport",-23.798608,-45.400035,7,"SA","BR","BR-SP","São Sebastião","no","SJPQ",,"SP0648",,,
+337778,"BR-1266","heliport","(Duplicate)Terminal Petrobrás - São Sebastião Heliport",-0.023,-0.045,7,"SA","BR","BR-SP","São Sebastião","no",,,"SP0648",,,
 337785,"BR-1267","small_airport","Fazenda Promissão Airport",-11.791489,-54.443706,1194,"SA","BR","BR-MT","União do Sul","no","SJPS",,"MT0206",,,
 337790,"BR-1268","small_airport","Quatro Ventos Airport",-18.973799,-48.105909,3030,"SA","BR","BR-MG","Uberlândia","no","SJPT",,"MG0129",,,
 337793,"BR-1269","small_airport","Clube de Ultraleves do Piauí Airport",-5.032856,-42.718443,459,"SA","BR","BR-PI","Teresina","no","SJPU",,"PI0027",,,
@@ -16361,7 +16361,7 @@
 39769,"CA-0123","small_airport","Delta Tango Field",55.8094,-117.8924,1852,"NA","CA","CA-AB","Eaglesham","no","CDT8",,"CDT8",,,"EX2"
 39770,"CA-0124","closed","East Templeton Airport",45.499401,-75.547401,150,"NA","CA","CA-QC","Gatineau","no",,,,,,
 39771,"CA-0125","closed","Bremner Airport",53.583302,-113.233002,2225,"NA","CA","CA-AB","Edmonton","no",,,,,,"FR3, FR3"
-39772,"CA-0126","closed","Namao Airport",53.68330001831055,-113.46700286865234,,"NA","CA","CA-AB","Edmonton","no",,,,,,
+39772,"CA-0126","closed","Namao Airport",53.674359,-113.461629,,"NA","CA","CA-AB","Edmonton","no",,,,,,"YED, CYED, CFB Edmonton, CFB Namao"
 39773,"CA-0127","closed","Edmunston (Fraser Papers Inc) Heliport",47.36666488647461,-68.33333587646484,,"NA","CA","CA-NB",,"no",,,,,,
 39774,"CA-0128","closed","Eltrut Airport",48.96666717529297,-92.36666870117188,,"NA","CA","CA-ON",,"no",,,,,,
 39775,"CA-0129","closed","Esker Lake Airport",61.650001525878906,-74.66666412353516,,"NA","CA","CA-QC",,"no",,,,,,
@@ -16676,7 +16676,7 @@
 46508,"CA-0438","closed","Scott's Airstrip",43.8735194557,-77.158741951,,"NA","CA","CA-ON","Prince Edward County","no",,,,,,
 46520,"CA-0439","closed","Wellington Airstrip",43.96675,-77.31325,285,"NA","CA","CA-ON","Bloomfield","no",,,,,,
 46521,"CA-0440","closed","Point Petre Helipad",43.843244,-77.144757,,"NA","CA","CA-ON","Prince Edward County","no",,,,,,"CWQP, CWQP, CWQP"
-46523,"CA-0441","closed","Edmonton / St. Albert",53.690049,-113.693433,2270,"NA","CA","CA-AB","St. Albert","no",,,,,,"ES3"
+46523,"CA-0441","closed","Edmonton / St. Albert Aerodrome",53.690049,-113.693433,2270,"NA","CA","CA-AB","St. Albert","no",,,,,,"ES3, CES3"
 46545,"CA-0442","small_airport","Little's Farm",43.7975530554,-79.7895812988,,"NA","CA","CA-ON",,"no",,,,,,
 46577,"CA-0443","small_airport","Brier Island Airstrip",44.25700308649999,-66.3593530655,,"NA","CA","CA-NS","Westport","no",,,,,,
 46580,"CA-0444","small_airport","Beaverton Airport",44.447473,-79.100107,820,"NA","CA","CA-ON",,"no","CBV2",,"CBV2",,"https://en.wikipedia.org/wiki/Beaverton_Aerodrome",
@@ -17095,7 +17095,7 @@
 508876,"CA-0857","small_airport","Caribou Canim Ranch Airport",51.88313,-120.61608,2569,"NA","CA","CA-BC","Cariboo","no",,,,,,
 508931,"CA-0858","closed","Little Red River Airport",58.406163,-114.751768,845,"NA","CA","CA-AB","Little Red River Cree","no",,,,,,
 536083,"CA-0859","closed","Currie Field",44.57146,-80.99234,,"NA","CA","CA-ON","Georgian Bluffs","no",,,,,,
-508941,"CA-0860","closed","fort assiniboine Airport",54.335719,-114.717436,1355,"NA","CA","CA-AB","fort assiniboine","no",,,,,,
+508941,"CA-0860","closed","Fort Assiniboine Airport",54.335698,-114.71706,1355,"NA","CA","CA-AB","Fort Assiniboine","no",,,,,,
 508952,"CA-0861","small_airport","Smithville Aerodrome",43.1019,-79.63032,646,"NA","CA","CA-ON","Smithville","no",,,,,,
 509073,"CA-0862","closed","Alvinston Airport",42.82033,-81.88119,699,"NA","CA","CA-ON","Alvinston","no",,,,,,
 509074,"CA-0863","closed","Carver's Airport",42.8628,-82.20072,643,"NA","CA","CA-ON","Petrolia","no",,,,,,
@@ -17170,6 +17170,7 @@
 536446,"CA-0932","small_airport","Darling Airport",53.47817,-110.84782,2060,"NA","CA","CA-AB","Clandonald","no",,,,,,
 536486,"CA-0933","small_airport","Ojay Airport",54.671647,-120.342214,3547,"NA","CA","CA-BC","Peace River","no",,,,,,
 536727,"CA-0934","seaplane_base","Kegaska Water Aerodrome",50.19,-61.26,0,"NA","CA","CA-QC","Kégashka","no",,,"SP7",,,
+536990,"CA-0935","closed","King Eddys Landing Field",50.21596,-119.17362,1710,"NA","CA","CA-BC","Coldstream","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",,,
@@ -17562,7 +17563,7 @@
 46478,"CCE6","small_airport","Camden East Airstrip",44.325629,-76.792502,,"NA","CA","CA-ON","Odessa","no",,,"CCE6",,"https://en.wikipedia.org/wiki/Camden_East_Aerodrome",
 509870,"CCE7","heliport","Edmonton City Heliport",53.535683,-113.663777,2254,"NA","CA","CA-AB","Edmonton","no","CCE7",,"CCE7",,,
 754,"CCF4","small_airport","Porters Lake Airport",44.709994,-63.299682,20,"NA","CA","CA-NS","Porters Lake","no","CCF4",,"CCF4",,"https://en.wikipedia.org/wiki/Porters_Lake_Airport",
-45221,"CCF6","small_airport","Edmonton/Morinville (Currie Field)",53.819722,-113.760833,2374,"NA","CA","CA-AB",,"no","CCF6",,"CCF6",,"https://en.wikipedia.org/wiki/Edmonton/Morinville_(Currie_Field)_Aerodrome",
+45221,"CCF6","small_airport","Edmonton/Morinville (Currie Field) Aerodrome",53.819638,-113.760837,2374,"NA","CA","CA-AB","Morinville","no","CCF6",,"CCF6",,"https://en.wikipedia.org/wiki/Edmonton/Morinville_(Currie_Field)_Aerodrome",
 314212,"CCF7","small_airport","Alida/Cowan Farm Private Aerodrome",49.395901,-101.8249,1869,"NA","CA","CA-SK","Alida","no","CCF7",,"CCF7",,"https://en.wikipedia.org/wiki/Alida/Cowan_Farm_Private_Aerodrome",
 755,"CCF9","small_airport","Scottsfield Airpark",45.9603,-67.095299,600,"NA","CA","CA-NB","Scottsfield","no","CCF9",,"CCF9",,"https://en.wikipedia.org/wiki/Scottsfield_Airpark",
 28284,"CCG2","closed","Lac Gobeil Water Aerodrome",48.241699,-69.647202,450,"NA","CA","CA-QC","Grandes-Bergeronnes","no",,,,,,"CCG2, CCG2, CCG2"
@@ -17879,7 +17880,7 @@
 46604,"CEL3","small_airport","East Linton (Kerr Field)",44.661068,-80.944026,750,"NA","CA","CA-ON","East Linton","no","CEL3",,"CEL3",,"https://en.wikipedia.org/wiki/East_Linton_(Kerr_Field)_Aerodrome",
 870,"CEL4","small_airport","Hanna Airport",51.632158,-111.904651,2738,"NA","CA","CA-AB","Hanna","no","CEL4",,"CEL4",,"https://en.wikipedia.org/wiki/Hanna_Airport","EL4"
 871,"CEL5","small_airport","Valleyview Airport",55.032941,-117.294545,2435,"NA","CA","CA-AB","Valleyview","no","CEL5",,"CEL5",,"https://en.wikipedia.org/wiki/Valleyview_Airport","EL5"
-872,"CEL6","small_airport","Two Hills Airport",53.70000076293945,-111.78299713134766,2010,"NA","CA","CA-AB","Two Hills","no","CEL6",,"CEL6",,"https://en.wikipedia.org/wiki/Two_Hills_Airport","EL6"
+872,"CEL6","small_airport","Two Hills Airport",53.709759,-111.788162,2010,"NA","CA","CA-AB","Two Hills","no","CEL6",,"CEL6",,"https://en.wikipedia.org/wiki/Two_Hills_Airport","EL6"
 28222,"CEL7","seaplane_base","Ford Bay Seaplane Base",66.030093,-124.687376,512,"NA","CA","CA-NT","Ford Bay","no","CEL7",,"CEL7",,"https://en.wikipedia.org/wiki/Ford_Bay_Water_Aerodrome","EL7"
 46590,"CEL8","small_airport","Eleonore Aerodrome",52.718861,-76.079807,750,"NA","CA","CA-QC","Opinaca Reservoir","no","CEL8",,,,"https://en.wikipedia.org/wiki/%C3%89l%C3%A9onore_Aerodrome",
 46531,"CEL9","heliport","Calgary (Eastlake) Heliport",50.955011,-113.972867,3418,"NA","CA","CA-AB","Calgary","no","CEL9",,"CEL9",,,
@@ -17895,7 +17896,7 @@
 28210,"CEN7","seaplane_base","Deliné Seaplane Base",65.183299,-123.417,512,"NA","CA","CA-NT","Deliné","no","CEN7",,"CEN7",,"https://en.wikipedia.org/wiki/D%C3%A9line_Water_Aerodrome","EN7, Fort Franklin Water Aerodrome"
 28470,"CEN9","seaplane_base","Yellowknife Seaplane Base",62.466702,-114.349998,514,"NA","CA","CA-NT",,"no","CEN9",,"CEN9",,"https://en.wikipedia.org/wiki/Yellowknife_Water_Aerodrome",
 882,"CEP2","heliport","Calgary (Bow Crow) Heliport",51.103165,-114.214962,3540,"NA","CA","CA-AB","Calgary","no","CEP2",,"CEP2",,,
-883,"CEP3","small_airport","Barrhead Airport",54.099998474121094,-114.43299865722656,2121,"NA","CA","CA-AB","Barrhead","no","CEP3",,"CEP3",,"https://en.wikipedia.org/wiki/Barrhead_Airport","EP3"
+883,"CEP3","small_airport","Barrhead Airport",54.096874,-114.438868,2121,"NA","CA","CA-AB","Barrhead","no","CEP3",,"CEP3",,"https://en.wikipedia.org/wiki/Barrhead_Airport","EP3"
 884,"CEP4","small_airport","Ross International Airport",48.9987048532,-111.975414276,3550,"NA","CA","CA-AB","Coutts","no","CEP4",,"CEP4",,"https://en.wikipedia.org/wiki/Coutts/Ross_International_Airport","EP4"
 885,"CEP5","small_airport","Janvier Airport",55.900001525878906,-110.73300170898438,1575,"NA","CA","CA-AB","Janvier","no","CEP5",,"CEP5",,"https://en.wikipedia.org/wiki/Janvier_Airport","EP5"
 886,"CEP6","small_airport","Warner Airport",49.29330062866211,-112.18900299072266,3319,"NA","CA","CA-AB","Warner","no","CEP6",,"CEP6",,"https://en.wikipedia.org/wiki/Warner_Airport","EP6"
@@ -17935,7 +17936,7 @@
 908,"CEV7","small_airport","Tofield Airport",53.3713,-112.696731,2311,"NA","CA","CA-AB","Tofield","no","CEV7",,"CEV7",,"https://en.wikipedia.org/wiki/Tofield_Airport",
 909,"CEV9","small_airport","Snare River Airport",63.4333,-116.174963,700,"NA","CA","CA-NT","Snare River","no","CEV9",,"CEV9",,"https://en.wikipedia.org/wiki/Snare_River_Airport","EV9"
 518829,"CEW2","small_airport","Combine World Field",52.000163,-106.116257,1725,"NA","CA","CA-SK","Elstow","no","CEW2",,"CEW2",,"https://en.wikipedia.org/wiki/Elstow/Combine_World_Field_Aerodrome",
-910,"CEW3","small_airport","St. Paul Airport",53.9933013916,-111.379997253,2147,"NA","CA","CA-AB","St. Paul","no","CEW3","ZSP","CEW3",,"https://en.wikipedia.org/wiki/St._Paul_Airport_(Alberta)","EW3"
+910,"CEW3","small_airport","St. Paul Airport",53.993695,-111.377993,2147,"NA","CA","CA-AB","St. Paul","no","CEW3","ZSP","CEW3",,"https://en.wikipedia.org/wiki/St._Paul_Airport_(Alberta)","EW3, Saint Paul"
 911,"CEW5","small_airport","Milk River Airport",49.13330078125,-112.05000305175781,3449,"NA","CA","CA-AB","Milk River","no","CEW5",,"CEW5",,"https://en.wikipedia.org/wiki/Milk_River_Airport","EW5"
 912,"CEW7","heliport","Edmonton / University of Alberta (Stollery Children's Hospital Mahi) Heliport",53.520437,-113.525309,2367,"NA","CA","CA-AB","Edmonton","no","CEW7",,"CEW7",,"https://en.wikipedia.org/wiki/University_of_Alberta_Hospital",
 28361,"CEW8","seaplane_base","Paulatuk Seaplane Base",69.349998,-124.067001,0,"NA","CA","CA-NT",,"no","CEW8",,"CEW8",,"https://en.wikipedia.org/wiki/Paulatuk_Water_Aerodrome","EW8"
@@ -17971,7 +17972,7 @@
 926,"CFA8","heliport","Three Hills (Hospital) Heliport",51.708678,-113.25188,3000,"NA","CA","CA-AB","Three Hills","no","CFA8",,"CFA8",,,"FA8"
 927,"CFB2","heliport","Frank Channel (Forestry) Heliport",62.786345,-115.945498,520,"NA","CA","CA-NT","Frank Channel","no","CFB2",,"CFB2",,"https://en.wikipedia.org/wiki/List_of_heliports_in_Canada#93",
 928,"CFB3","small_airport","Hespero Airport",52.29999923706055,-114.46399688720703,3175,"NA","CA","CA-AB","Hespero","no","CFB3",,"CFB3",,"https://en.wikipedia.org/wiki/Hespero_Airport","FB3"
-929,"CFB4","small_airport","Trout Lake Airport",56.5,-114.55000305175781,2290,"NA","CA","CA-AB","Trout Lake","no","CFB4",,"CFB4",,"https://en.wikipedia.org/wiki/Trout_Lake_Airport_(Alberta)","FB4"
+929,"CFB4","small_airport","Trout Lake Airport",56.498952,-114.547735,2290,"NA","CA","CA-AB","Trout Lake","no","CFB4",,"CFB4",,"https://en.wikipedia.org/wiki/Trout_Lake_Airport_(Alberta)","FB4, Graham Lake"
 930,"CFB5","small_airport","Namur Lake Airport",57.38330078125,-112.80000305175781,2560,"NA","CA","CA-AB","Namur Lake","no","CFB5",,"CFB5",,"https://en.wikipedia.org/wiki/Namur_Lake_Airport","FB5"
 931,"CFB6","small_airport","Edmonton / Josephburg Airport",53.727998032,-113.086566925,2069,"NA","CA","CA-AB","Edmonton","no","CFB6",,"CFB6",,"https://en.wikipedia.org/wiki/Edmonton/Josephburg_Airport","FB6, Josephburg, Warren Thomas"
 932,"CFB7","small_airport","Steen River Airport",59.633301,-117.167,996,"NA","CA","CA-AB","Steen River","no","CFB7",,"CFB7",,"https://en.wikipedia.org/wiki/Steen_River_Airport","FB7"
@@ -18723,7 +18724,7 @@
 320678,"CMN3","small_airport","St-Michel-de-Napierville Airport",45.213804,-73.576,206,"NA","CA","CA-QC","St-Michel-de-Napierville","no","CMN3",,"CMN3",,"https://en.wikipedia.org/wiki/Saint-Michel-de-Napierville_Aerodrome",
 45050,"CMN4","small_airport","Minto",62.604722,-137.221944,2969,"NA","CA","CA-YT",,"no","CMN4",,,,"https://en.wikipedia.org/wiki/Minto_Aerodrome",
 46539,"CMN5","small_airport","Manic-Cinq Airport",50.657732,-68.831019,1332,"NA","CA","CA-QC","Manicouagan","no","CMN5",,,,"https://en.wikipedia.org/wiki/Manic-5_Aerodrome","mn5"
-45049,"CMN6","small_airport","Edmonton/Morinville (Mike's Field)",53.836944,-113.563333,2302,"NA","CA","CA-AB",,"no","CMN6",,,,"https://en.wikipedia.org/wiki/Edmonton/Morinville_(Mike%27s_Field)_Aerodrome",
+45049,"CMN6","small_airport","Edmonton/Morinville (Mike's Field) Aerodrome",53.836944,-113.563333,2302,"NA","CA","CA-AB","Morinville","no","CMN6",,,,,
 1283,"CMR6","heliport","Camrose / St Mary's Hospital Heliport",53.0151382454,-112.830169201,2413,"NA","CA","CA-AB","Camrose","no","CMR6",,"CMR6",,,"MR6"
 1284,"CMS2","heliport","Middleton (Soldiers Memorial Hospital) Heliport",44.9461283973,-65.05903959269999,53,"NA","CA","CA-NS","Middleton","no","CMS2",,"CMS2",,,"MS2"
 320781,"CMS3","seaplane_base","Marina le Nautique Water Aerodrome",46.69,-73.898702,1177,"NA","CA","CA-QC","St-Michel-des-Saints","no","CMS3",,"CMS3",,"https://en.wikipedia.org/wiki/Saint-Michel-des-Saints_(Marina_Le_Nautique)_Water_Aerodrome",
@@ -19716,7 +19717,7 @@
 1486,"CRE2","small_airport","Edzo Airport",62.766701,-116.084,587,"NA","CA","CA-NT","Rae-Edzo","no","CRE2",,"CRE2",,"https://en.wikipedia.org/wiki/Rae/Edzo_Airport","RE2"
 46538,"CRE3","small_airport","Rand Private Airfield",43.066501,-80.6986,1060,"NA","CA","CA-ON","Curries","no","CRE3",,"CRE3",,"https://en.wikipedia.org/wiki/Curries_(Rand_Private_Airfield)_Aerodrome",
 1487,"CRF2","heliport","Langley (Russell Farm) Heliport",49.0110458923,-122.672213316,250,"NA","CA","CA-BC","Langley","no","CRF2",,"CRF2",,,"RF2"
-46528,"CRF3","small_airport","Edmonton / Villeneuve (Rose Field)",53.645556,-113.802778,2190,"NA","CA","CA-AB","Villeneuve","no","CRF3",,"CRF3",,"https://en.wikipedia.org/wiki/Edmonton/Villeneuve_(Rose_Field)_Aerodrome",
+46528,"CRF3","small_airport","Edmonton / Villeneuve (Rose Field) Aerodrome",53.645664,-113.80275,2190,"NA","CA","CA-AB","Villeneuve","no","CRF3",,"CRF3",,"https://en.wikipedia.org/wiki/Edmonton/Villeneuve_(Rose_Field)_Aerodrome",
 46532,"CRF4","small_airport","Calgary / Okotoks (Rowland Field)",50.764722,-113.958056,3800,"NA","CA","CA-AB","Calgary","no","CRF4",,"CRF4",,"https://en.wikipedia.org/wiki/Calgary/Okotoks_(Rowland_Field)_Aerodrome","RF4"
 320683,"CRF5","small_airport","Saskatoon/Richter Field Airport",52.280342,-106.684242,1700,"NA","CA","CA-SK","Martensville","no","CRF5",,"CRF5",,"https://en.wikipedia.org/wiki/Saskatoon/Richter_Field_Aerodrome",
 321883,"CRF6","seaplane_base","Quamichan Lake (Raven Field) Seaplane Base",48.8083,-123.650001,100,"NA","CA","CA-BC",,"no","CRF6",,"CRF6",,"https://en.wikipedia.org/wiki/Quamichan_Lake_(Raven_Field)_Water_Aerodrome",
@@ -20613,7 +20614,7 @@
 1933,"CYVC","medium_airport","La Ronge Airport",55.151401519800004,-105.262001038,1242,"NA","CA","CA-SK","La Ronge","yes","CYVC","YVC",,,"https://en.wikipedia.org/wiki/La_Ronge_(Barber_Field)_Airport",
 1934,"CYVD","medium_airport","Virden / RJ (Bob) Andrew Field Regional Aerodrome",49.8783,-100.917999,1454,"NA","CA","CA-MB","Virden","no","CYVD",,"YVD",,"https://en.wikipedia.org/wiki/Virden_Airport",
 1935,"CYVG","small_airport","Vermilion Airport",53.357714,-110.827388,2025,"NA","CA","CA-AB","Vermilion","no","CYVG","YVG","YVG",,"https://en.wikipedia.org/wiki/Vermilion_Airport","YVG"
-1936,"CYVK","medium_airport","Vernon Airport",50.24810028076172,-119.33100128173828,1140,"NA","CA","CA-BC","Vernon","no","CYVK","YVE",,,"https://en.wikipedia.org/wiki/Vernon_Regional_Airport","YVK"
+1936,"CYVK","medium_airport","Vernon Regional Airport",50.246163,-119.330963,1140,"NA","CA","CA-BC","Vernon","no","CYVK","YVE",,,"https://en.wikipedia.org/wiki/Vernon_Regional_Airport","YVK"
 314953,"CYVL","small_airport","Tommy Kochon Airport",67.02,-126.126,870,"NA","CA","CA-NT","Colville Lake","yes","CYVL","YCK",,,"https://en.wikipedia.org/wiki/Colville_Lake/Tommy_Kochon_Aerodrome",
 1937,"CYVM","small_airport","Qikiqtarjuaq Airport",67.54656,-64.03141,21,"NA","CA","CA-NU","Qikiqtarjuaq","yes","CYVM","YVM",,,"https://en.wikipedia.org/wiki/Qikiqtarjuaq_Airport",
 1938,"CYVO","medium_airport","Val-d'Or Airport",48.0532989502,-77.7827987671,1107,"NA","CA","CA-QC","Val-d'Or","yes","CYVO","YVO",,"http://www.arvo.qc.ca/","https://en.wikipedia.org/wiki/Val-d'Or_Airport",
@@ -20958,7 +20959,7 @@
 2019,"CZGF","medium_airport","Grand Forks Airport",49.015598,-118.431,1720,"NA","CA","CA-BC","Grand Forks","no","CZGF","ZGF",,,"https://en.wikipedia.org/wiki/Grand_Forks_Airport",
 2020,"CZGI","small_airport","Gods River Airport",54.839699,-94.078598,627,"NA","CA","CA-MB","Gods River","yes","CZGI","ZGI",,,"https://en.wikipedia.org/wiki/Gods_River_Airport",
 2021,"CZGR","small_airport","Little Grand Rapids Airport",52.045417,-95.46617,1005,"NA","CA","CA-MB","Little Grand Rapids","yes","CZGR","ZGR",,,"https://en.wikipedia.org/wiki/Little_Grand_Rapids_Airport",
-2022,"CZHP","small_airport","High Prairie Airport",55.3936004639,-116.474998474,1974,"NA","CA","CA-AB","High Prairie","no","CZHP","ZHP",,,"https://en.wikipedia.org/wiki/High_Prairie_Airport","ZHP"
+2022,"CZHP","small_airport","High Prairie Airport",55.3936,-116.474998,1974,"NA","CA","CA-AB","High Prairie","no","CZHP","ZHP",,,"https://en.wikipedia.org/wiki/High_Prairie_Airport","ZHP"
 308731,"CZJ","small_airport","Corazón de Jesús Airport",9.44686,-78.575678,8,"NA","PA","PS-GY","Tupile","no","MPCJ","CZJ",,,"https://en.wikipedia.org/wiki/Coraz%C3%B3n_de_Jes%C3%BAs_Airport","Narganá, Usdup"
 2023,"CZJG","medium_airport","Jenpeg Airport",54.51890182495117,-98.04609680175781,729,"NA","CA","CA-MB","Jenpeg","no","CZJG","ZJG",,,"https://en.wikipedia.org/wiki/Jenpeg_Airport",
 2024,"CZJN","medium_airport","Swan River Airport",52.120602,-101.236,1100,"NA","CA","CA-MB","Swan River","no","CZJN","ZJN",,,"https://en.wikipedia.org/wiki/Swan_River_Airport",
@@ -24110,7 +24111,7 @@
 30577,"EPZA","small_airport","Zamość-Mokre Airfield",50.701698,23.204399,751,"EU","PL","PL-LU","Zamość","no","EPZA",,,,"https://pl.wikipedia.org/wiki/Lotnisko_Zamo%C5%9B%C4%87-Mokre",
 320302,"EPZB","small_airport","Zborowo Airfield",52.362056,16.638722,268,"EU","PL","PL-WP","Zborowo","no","EPZB",,,"http://www.zborowo.pl",,
 2639,"EPZG","medium_airport","Zielona Góra-Babimost Airport",52.1385,15.7986,194,"EU","PL","PL-LB","Nowe Kramsko","yes","EPZG","IEG",,"http://www.lotnisko.zielonagora.pl/","https://en.wikipedia.org/wiki/Zielona_G%C3%B3ra_Airport",
-323063,"EPZK","small_airport","Konopnica Airport",51.360179,18.822057,,"EU","PL","PL-LD","Konopnica","no","EPZK",,,,,
+323063,"EPZK","small_airport","Konopnica Airfield",51.360179,18.822057,,"EU","PL","PL-LD","Konopnica","no","EPZK",,,,,
 31017,"EPZN","closed","Żagań-Tomaszowo Air Base",51.627499,15.4083,459,"EU","PL","PL-LB","Tomaszowo","no",,,,,,"EPZN, Zagan"
 30582,"EPZP","small_airport","Zielona Góra-Przylep Airfield",51.978901,15.4639,249,"EU","PL","PL-LB","Zielona Góra","no","EPZP",,,,"https://pl.wikipedia.org/wiki/Lotnisko_Zielona_G%C3%B3ra-Przylep",
 30578,"EPZR","small_airport","Żar Airfield",49.771099,19.2181,1260,"EU","PL","PL-SL","Międzybrodzie  Żywieckie","no","EPZR",,,,"https://pl.wikipedia.org/wiki/Lotnisko_%C5%BBar","Góra Żar"
@@ -28935,6 +28936,7 @@
 534510,"GB-1128","small_airport","Park Farm Airstrip",51.9823,0.6696,272,"EU","GB","GB-ENG","Halstead, Essex","no",,,,,,
 534883,"GB-1129","closed","Woburn Park Airfield",51.99146,-0.59959,,"EU","GB","GB-ENG","Milton Keynes, Buckinghamshire","no",,,,,,
 535015,"GB-1130","closed","RAF Downham Market / Bexwell Aerodrome",52.61093,0.40522,,"EU","GB","GB-ENG","Downham Market, Norfolk","no",,,,,,
+536974,"GB-1131","heliport","Arran south Helipad",55.449903,-5.111319,,"EU","GB","GB-SCT",,"no",,,,,,
 30935,"GB-DOC","small_airport","Dornoch Airfield",57.868999,-4.023,1,"EU","GB","GB-SCT","Dornoch, Sunderland","no",,"DOC",,"http://www.dornochairfield.com/",,"EG08, EGZJ"
 31147,"GB-FLH","small_airport","Flotta Isle Airstrip",58.825802,-3.14278,50,"EU","GB","GB-SCT","Flotta Isle","no",,"FLH",,,"https://en.wikipedia.org/wiki/Flotta_Isle_Airport","EGZR"
 31199,"GB-FOA","small_airport","Foula Airfield",60.121725,-2.053202,150,"EU","GB","GB-SCT","Foula","yes",,"FOA",,,"https://en.wikipedia.org/wiki/Foula_Airfield","EGFO"
@@ -30151,7 +30153,7 @@
 347085,"IA53","heliport","MercyOne Dyersville Heliport",42.476711,-91.130117,960,"NA","US","US-IA","Dyersville","no","IA53",,"IA53",,,
 17731,"IA54","small_airport","Anderson Airport",42.50175,-90.84218,1135,"NA","US","US-IA","Dubuque","no","IA54",,"IA54",,,
 17732,"IA55","heliport","Myrtue Memorial Hospital Heliport",41.649200439453125,-95.32420349121094,1231,"NA","US","US-IA","Harlan","no","IA55",,"IA55",,,
-17733,"IA56","small_airport","Farrar Airport",41.78049850463867,-93.37940216064453,916,"NA","US","US-IA","Farrar","no","IA56",,"IA56",,,
+17733,"IA56","small_airport","Farrar Airport",41.780452,-93.379735,916,"NA","US","US-IA","Maxwell","no","IA56",,"IA56",,,
 17734,"IA57","heliport","Mercy Hospital Heliport",42.67390060424805,-91.90180206298828,1119,"NA","US","US-IA","Oelwein","no","IA57",,"IA57",,,
 17735,"IA58","small_airport","B-8 Farms Airport",42.1150016784668,-96.1719970703125,1063,"NA","US","US-IA","Whiting","no","IA58",,"IA58",,,
 17736,"IA59","closed","Bickel Airport",40.391701,-91.416801,680,"NA","US","US-IA","Keokuk","no",,,,,,"IA59"
@@ -30180,7 +30182,7 @@
 17758,"IA81","heliport","Genesis Medical Center West Campus Heliport",41.54280090332031,-90.59239959716797,169,"NA","US","US-IA","Davenport","no","IA81",,"IA81",,,
 17759,"IA82","heliport","Mercy Hospital Medical Center Private Heliport",41.599998474121094,-93.62100219726562,894,"NA","US","US-IA","Des Moines","no","IA82",,"IA82",,,
 17760,"IA83","small_airport","Kohlhaas Airport",42.954883,-94.167638,1153,"NA","US","US-IA","Livermore","no","IA83",,"IA83",,,
-17761,"IA84","small_airport","Lawton Airport",42.483299255371094,-96.20030212402344,1235,"NA","US","US-IA","Lawton","no","IA84",,"IA84",,,
+17761,"IA84","small_airport","Lawton Airport",42.479107,-96.207184,1235,"NA","US","US-IA","Lawton","no","IA84",,"IA84",,,
 17762,"IA85","small_airport","Tuinstra Airfield",41.43510055541992,-93.54049682617188,900,"NA","US","US-IA","Indianola","no","IA85",,"IA85",,,
 17763,"IA86","small_airport","Hedgewood Landing Airport",41.266700744628906,-93.5093994140625,990,"NA","US","US-IA","Indianola","no","IA86",,"IA86",,,
 17764,"IA87","closed","Robel Field",41.657501,-93.821097,965,"NA","US","US-IA","Grimes","no",,,,,,"IA87"
@@ -35976,6 +35978,10 @@
 536132,"JP-3395","heliport","Narushima Heliport",32.846329,128.912775,292,"AS","JP","JP-42","Goto","no",,,,,,
 536133,"JP-3396","heliport","Arikawa Heliport",32.98627,129.12297,88,"AS","JP","JP-42","Shinkamigoto","no",,,,,,
 536134,"JP-3397","heliport","Kogushigo Heliport",33.05472,129.09765,92,"AS","JP","JP-42","Shinkamigoto","no",,,,,,
+536966,"JP-3398","heliport","Ushima Heliport",33.86137,132.00589,3,"AS","JP","JP-35","Hikari","no",,,,,,
+536967,"JP-3399","heliport","Kaikawa Community Plaza Heliport",33.59449,132.53427,1056,"AS","JP","JP-38","Ozu","no",,,,,,
+536968,"JP-3400","heliport","Kitanada Community Plaza Heliport",33.62911,132.52182,322,"AS","JP","JP-38","Ozu","no",,,,,,
+536970,"JP-3401","heliport","Osogoe Heliport",33.561571,133.14396,1601,"AS","JP","JP-39","Niyodogawa","no",,,,,,
 313333,"JPB","closed","Pan Am Building Heliport",40.7533,-73.9765,870,"NA","US","US-NY","New York","no",,,,,,"JPB"
 18255,"JPN","heliport","Pentagon Army Heliport",38.874908,-77.056682,40,"NA","US","US-VA","Washington DC","no","KJPN","JPN","JPN",,"https://en.wikipedia.org/wiki/Pentagon_Army_Heliport","Arlington"
 18256,"JRA","heliport","West 30th Street Heliport",40.755107,-74.006896,7,"NA","US","US-NY","New York","yes","KJRA","JRA","JRA",,"https://en.wikipedia.org/wiki/West_30th_Street_Heliport",
@@ -36161,7 +36167,7 @@
 18434,"K17N","small_airport","Cross Keys Airport",39.705502,-75.032997,162,"NA","US","US-NJ","Cross Keys","no","K17N",,"17N",,"https://en.wikipedia.org/wiki/Cross_Keys_Airport",
 18435,"K17V","small_airport","Haxtun Municipal Airport",40.627519,-102.600911,4035,"NA","US","US-CO","Haxtun","no","K17V",,"17V",,,
 18436,"K18A","small_airport","Franklin County Airport",34.340099,-83.133499,890,"NA","US","US-GA","Canon","no","K18A",,"18A",,"https://en.wikipedia.org/wiki/Franklin_County_Airport_(Georgia)",
-18437,"K18I","small_airport","McCreary County Airport",36.6959,-84.391602,1370,"NA","US","US-KY","Pine Knot","no","K18I",,"18I",,"https://en.wikipedia.org/wiki/McCreary_County_Airport",
+18437,"K18I","small_airport","McCreary County Airport",36.695525,-84.391345,1370,"NA","US","US-KY","Pine Knot","no","K18I",,"18I",,"https://en.wikipedia.org/wiki/McCreary_County_Airport",
 18438,"K18V","small_airport","Platte Valley Airpark",40.0999984741,-104.700996399,4965,"NA","US","US-CO","Hudson","no","18V",,"18V",,"https://en.wikipedia.org/wiki/Platte_Valley_Airpark",
 18439,"K19A","small_airport","Jackson County Airport",34.174,-83.560699,951,"NA","US","US-GA","Jefferson","no","KJCA",,"JCA","http://www.jacksoncountygov.com/index.aspx?page=40","https://en.wikipedia.org/wiki/Jackson_County_Airport_(Georgia)","19A"
 18440,"K19M","small_airport","C. A. Moore Airport",33.1255,-90.025597,340,"NA","US","US-MS","Lexington","no","K19M",,"19M",,"https://en.wikipedia.org/wiki/C._A._Moore_Airport",
@@ -36320,7 +36326,7 @@
 18599,"K2K7","small_airport","Neodesha Municipal Airport",37.43539810180664,-95.64610290527344,841,"NA","US","US-KS","Neodesha","no","K2K7",,"2K7",,,
 18600,"K2K9","small_airport","Haskell Airport",35.83290100097656,-95.66739654541016,588,"NA","US","US-OK","Haskell","no","K2K9",,"2K9",,,
 18601,"K2L0","small_airport","Pineville Municipal Airport",31.341931,-92.4436,100,"NA","US","US-LA","Pineville","no",,,"2L0","http://www.pineville.net/department/?fDD=14-0",,"9LA6"
-18602,"K2M0","small_airport","Princeton Caldwell County Airport",37.1151008605957,-87.85710144042969,584,"NA","US","US-KY","Princeton","no","K2M0",,"2M0",,,
+18602,"K2M0","small_airport","Princeton-Caldwell County Airport",37.115116,-87.857144,584,"NA","US","US-KY","Princeton","no","K2M0",,"2M0","https://transportation.ky.gov/Aviation/Documents/Princeton-Calwell%20County.pdf",,
 18603,"K2M2","small_airport","Lawrenceburg Lawrence County Airport",35.234299,-87.257896,936,"NA","US","US-TN","Lawrenceburg","no","K2M2",,"2M2",,"https://en.wikipedia.org/wiki/Lawrenceburg%E2%80%93Lawrence_County_Airport",
 18604,"K2M4","small_airport","G V Montgomery Airport",32.354867,-89.48824,517,"NA","US","US-MS","Forest","no","K2M4",,"2M4",,"https://en.wikipedia.org/wiki/G._V._Montgomery_Airport","Forest Municipal"
 18605,"K2M8","small_airport","Charles W. Baker Airport",35.278999,-89.931503,247,"NA","US","US-TN","Millington","no","K2M8",,"2M8",,"https://en.wikipedia.org/wiki/Charles_W._Baker_Airport",
@@ -36751,7 +36757,7 @@
 19057,"K7F7","small_airport","Clifton Municipal Isenhower Field",31.817316,-97.569698,760,"NA","US","US-TX","Clifton","no",,,"7F7",,,
 19058,"K7G0","small_airport","Ledgedale Airpark",43.181099,-77.915802,665,"NA","US","US-NY","Brockport","no","K7G0",,"7G0",,"https://en.wikipedia.org/wiki/Ledgedale_Airpark",
 19059,"K7G8","small_airport","Geauga County Airport",41.4496,-81.062897,1174,"NA","US","US-OH","Middlefield","no",,,"7G8",,"https://en.wikipedia.org/wiki/Geauga_County_Airport",
-19060,"K7G9","small_airport","Canton Municipal Airport",43.308899,-96.570999,1290,"NA","US","US-SD","Canton","no",,"CTK","7G9","https://cantonsd.org/our-community/cornerstones/airport/",,"SD10"
+19060,"K7G9","small_airport","Canton Municipal Airport",43.308842,-96.571225,1290,"NA","US","US-SD","Canton","no","K7G9","CTK","7G9","https://cantonsd.org/our-community/cornerstones/airport/",,"SD10"
 19061,"K7I4","small_airport","Orleans Airport",38.65840148925781,-86.44300079345703,655,"NA","US","US-IN","Orleans","no","K7I4",,"7I4",,,
 19062,"K7K4","small_airport","Ohio County Airport",37.458302,-86.849998,535,"NA","US","US-KY","Hartford","no","KJQD",,"JQD",,,"7K4"
 19063,"K7K5","small_airport","Kenmare Municipal Airport",48.667599,-102.047997,1962,"NA","US","US-ND","Kenmare","no","K7K5",,"7K5",,"https://en.wikipedia.org/wiki/Kenmare_Municipal_Airport",
@@ -37389,7 +37395,7 @@
 3468,"KCSG","medium_airport","Columbus Metropolitan Airport",32.516300201416016,-84.93890380859375,397,"NA","US","US-GA","Columbus","yes","KCSG","CSG","CSG",,"https://en.wikipedia.org/wiki/Columbus_Metropolitan_Airport",
 19558,"KCSM","small_airport","Clinton Sherman Airport",35.3398017883,-99.20050048830001,1922,"NA","US","US-OK","Clinton","no","KCSM","CSM","CSM",,"https://en.wikipedia.org/wiki/Clinton-Sherman_Industrial_Airpark",
 19559,"KCSQ","small_airport","Creston Municipal Airport",41.021400451699996,-94.36329650879999,1300,"NA","US","US-IA","Creston","no","KCSQ","CSQ","CSQ","http://www.crestoniowa.gov/crestonmunicipalairport.htm","https://en.wikipedia.org/wiki/Creston_Municipal_Airport",
-3469,"KCSV","medium_airport","Crossville Memorial Whitson Field",35.9513015747,-85.08499908450001,1881,"NA","US","US-TN","Crossville","no","KCSV","CSV","CSV","http://www.crossvilletn.gov/index.php/departments/airport",,
+3469,"KCSV","medium_airport","Crossville Memorial Airport Whitson Field",35.95131,-85.08499,1881,"NA","US","US-TN","Crossville","no","KCSV","CSV","CSV","http://www.crossvilletn.gov/index.php/departments/airport",,
 338688,"KCSY","closed","Crissy Field",37.80376,-122.46389,,"NA","US","US-CA","San Francisco","no",,,,,"https://en.wikipedia.org/wiki/Crissy_Field","KCSY, KCSY, CSY"
 3470,"KCTB","medium_airport","Cut Bank International Airport",48.608657,-112.378183,3854,"NA","US","US-MT","Cut Bank","no","KCTB","CTB","CTB","http://www.cutbankairport.org/","https://en.wikipedia.org/wiki/Cut_Bank_Municipal_Airport",
 19560,"KCTJ","small_airport","West Georgia Regional Airport / O V Gray Field",33.631001,-85.152,1161,"NA","US","US-GA","Carrollton","no","KCTJ",,"CTJ",,"https://en.wikipedia.org/wiki/West_Georgia_Regional_Airport",
@@ -38146,7 +38152,7 @@
 19896,"KFRR","small_airport","Front Royal Warren County Airport",38.9175,-78.253502,709,"NA","US","US-VA","Front Royal","no","KFRR","FRR","FRR",,"https://en.wikipedia.org/wiki/Front_Royal%E2%80%93Warren_County_Airport",
 3541,"KFSD","medium_airport","Sioux Falls Regional Airport / Joe Foss Field",43.585463,-96.741152,1429,"NA","US","US-SD","Sioux Falls","yes","KFSD","FSD","FSD","http://www.sfairport.com/","https://en.wikipedia.org/wiki/Sioux_Falls_Regional_Airport","Joe Foss Field, Fighting Lobos, Sioux Falls Army Air Base, 114th Fighter Wing, Sioux Falls Regional Airport"
 19897,"KFSE","small_airport","Fosston Municipal Airport-Anderson Field",47.5928,-95.773499,1277,"NA","US","US-MN","Fosston","no","KFSE",,"FSE",,,
-3542,"KFSI","medium_airport","Henry Post Army Air Field (Fort Sill)",34.64979935,-98.40219879,1189,"NA","US","US-OK","Fort Sill","no","KFSI","FSI","FSI","http://sill-www.army.mil/History/Airfield/henrypost.htm","https://en.wikipedia.org/wiki/Henry_Post_Army_Airfield",
+3542,"KFSI","medium_airport","Henry Post Army Air Field",34.649799,-98.402199,1189,"NA","US","US-OK","Fort Sill","no","KFSI","FSI","FSI","http://sill-www.army.mil/History/Airfield/henrypost.htm","https://en.wikipedia.org/wiki/Henry_Post_Army_Airfield",
 19898,"KFSK","small_airport","Fort Scott Municipal Airport",37.7984008789,-94.7694015503,918,"NA","US","US-KS","Fort Scott","no","KFSK","FSK","FSK","http://www.fscity.org/index.php?option=com_content&view=article&id=98&Itemid=195","https://en.wikipedia.org/wiki/Fort_Scott_Municipal_Airport",
 3543,"KFSM","medium_airport","Fort Smith Regional Airport",35.336601,-94.367401,469,"NA","US","US-AR","Fort Smith","yes","KFSM","FSM","FSM",,"https://en.wikipedia.org/wiki/Fort_Smith_Regional_Airport",
 19899,"KFSO","small_airport","Franklin County State Airport",44.9403,-73.097504,228,"NA","US","US-VT","Swanton","no","KFSO",,"FSO",,"https://en.wikipedia.org/wiki/Franklin_County_State_Airport","Highgate"
@@ -38603,7 +38609,7 @@
 3618,"KJAC","medium_airport","Jackson Hole Airport",43.6072998046875,-110.73799896240234,6451,"NA","US","US-WY","Jackson","yes","KJAC","JAC","JAC",,"https://en.wikipedia.org/wiki/Jackson_Hole_Airport",
 3619,"KJAN","medium_airport","Jackson-Medgar Wiley Evers International Airport",32.311199,-90.075897,346,"NA","US","US-MS","Jackson","yes","KJAN","JAN","JAN",,"https://en.wikipedia.org/wiki/Jackson-Evers_International_Airport",
 20203,"KJAS","small_airport","Jasper County Airport Bell Field",30.8857,-94.034897,213,"NA","US","US-TX","Jasper","no","KJAS","JAS","JAS",,,
-20204,"KJAU","small_airport","Colonel Tommy C Stiner Airfield",36.334073,-84.162977,1180,"NA","US","US-TN","Jacksboro","no","KJAU",,"JAU","https://campbellcountytn.gov/campbell-county-airport/","https://en.wikipedia.org/wiki/Campbell_County_Airport_(Tennessee)","Campbell County Airport"
+20204,"KJAU","small_airport","Campbell County Airport  - Colonel Tommy C Stiner Airfield",36.334073,-84.162977,1180,"NA","US","US-TN","Jacksboro","no","KJAU",,"JAU","https://campbellcountytn.gov/campbell-county-airport/","https://en.wikipedia.org/wiki/Campbell_County_Airport_(Tennessee)","Campbell County Airport"
 3620,"KJAX","large_airport","Jacksonville International Airport",30.492469,-81.687813,30,"NA","US","US-FL","Jacksonville","yes","KJAX","JAX","JAX","https://www.flyjacksonville.com/","https://en.wikipedia.org/wiki/Jacksonville_International_Airport",
 3621,"KJBR","medium_airport","Jonesboro Municipal Airport",35.83169937133789,-90.64640045166016,262,"NA","US","US-AR","Jonesboro","yes","KJBR","JBR","JBR",,"https://en.wikipedia.org/wiki/Jonesboro_Municipal_Airport",
 20205,"KJCT","medium_airport","Kimble County Airport",30.5112991333,-99.7634963989,1749,"NA","US","US-TX","Junction","no","KJCT","JCT","JCT",,,
@@ -40887,7 +40893,7 @@
 21042,"KSCD","small_airport","Merkel Field Sylacauga Municipal Airport",33.171799,-86.305496,569,"NA","US","US-AL","Sylacauga","no","KSCD",,"SCD",,"https://en.wikipedia.org/wiki/Sylacauga_Municipal_Airport",
 3871,"KSCH","medium_airport","Schenectady County Airport",42.852500915527,-73.928901672363,378,"NA","US","US-NY","Schenectady","no","KSCH","SCH","SCH","http://www.schenectadycounty.com/FullStory.aspx?m=100&amid=432","https://en.wikipedia.org/wiki/Schenectady_County_Airport",
 3872,"KSCK","medium_airport","Stockton Metropolitan Airport",37.893279,-121.238079,33,"NA","US","US-CA","Stockton","yes","KSCK","SCK","SCK","http://www.sjgov.org/airport/","https://en.wikipedia.org/wiki/Stockton_Metropolitan_Airport",
-21043,"KSCX","small_airport","Scott Municipal Airport",36.455601,-84.585701,1545,"NA","US","US-TN","Oneida","no","KSCX",,"SCX","https://scottcounty.com/government/county-facilities/scott-county-airport/","https://en.wikipedia.org/wiki/Scott_Municipal_Airport",
+21043,"KSCX","small_airport","Scott Municipal Airport",36.455505,-84.586008,1545,"NA","US","US-TN","Oneida","no","KSCX",,"SCX","https://scottcounty.com/government/county-facilities/scott-county-airport/","https://en.wikipedia.org/wiki/Scott_Municipal_Airport","Big South Fork Airpark"
 21044,"KSDA","small_airport","Shenandoah Municipal Airport",40.7515983581543,-95.4136962890625,971,"NA","US","US-IA","Shenandoah","no","KSDA",,"SDA",,,
 18698,"KSDC","small_airport","Williamson Sodus Airport",43.234573,-77.119403,424,"NA","US","US-NY","Williamson/Sodus","no","KSDC",,"SDC",,"https://en.wikipedia.org/wiki/Williamson%E2%80%93Sodus_Airport","3G7"
 3873,"KSDF","large_airport","Louisville Muhammad Ali International Airport",38.1744,-85.736,501,"NA","US","US-KY","Louisville","yes","KSDF","SDF","SDF","http://www.flylouisville.com","https://en.wikipedia.org/wiki/Louisville_International_Airport","Louisville International, Standiford Field"
@@ -42825,7 +42831,7 @@
 4393,"LKCS","small_airport","České Budějovice South Bohemian Airport",48.9464,14.4275,1417,"EU","CZ","CZ-JC","České Budějovice","no","LKCS","JCL",,"https://www.airport-cb.cz/","https://en.wikipedia.org/wiki/%C4%8Cesk%C3%A9_Bud%C4%9Bjovice_Airport","Jihočeské letiště České Budějovice"
 29785,"LKCT","small_airport","Chotěboř Airport",49.68579864501953,15.67609977722168,1949,"EU","CZ","CZ-VY","Chotěboř","no","LKCT",,,,,
 4394,"LKCV","medium_airport","Čáslav Air Base",49.939701,15.3818,794,"EU","CZ","CZ-ST","Chotusice","no","LKCV",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_%C4%8C%C3%A1slav","21st Tactical Air Base Čáslav"
-29836,"LKDK","small_airport","Dvůr Králové nad Labem Airport",50.4142,15.8369,932,"EU","CZ","CZ-KR","Dvůr Králové nad Labem","no","LKDK",,,,,
+29836,"LKDK","small_airport","Dvůr Králové nad Labem Airfield",50.4142,15.8369,932,"EU","CZ","CZ-KR","Dvůr Králové nad Labem","no","LKDK",,,,,
 29855,"LKER","small_airport","Erpužice Airfield",49.802799,13.0381,1572,"EU","CZ","CZ-PL","Erpužice","no","LKER",,,,,
 529379,"LKFM","heliport","Frydek Heliport",49.691111,18.355,1200,"EU","CZ","CZ-MO",,"no","LKFM",,,,,
 29881,"LKFR","small_airport","Frýdlant Airfield",49.589401,18.3792,1440,"EU","CZ","CZ-MO","Frýdlant","no","LKFR",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Fr%C3%BDdlant",
@@ -42842,11 +42848,11 @@
 29989,"LKJA","small_airport","Jaroměř Airfield",50.331402,15.9539,889,"EU","CZ","CZ-KR","Jaroměř","no","LKJA",,,,,
 29993,"LKJC","small_airport","Jičín Airfield",50.43,15.3331,863,"EU","CZ","CZ-KR","Jičín","no","LKJC",,,"https://www.letistejicin.cz/","https://en.wikipedia.org/wiki/Jičín_Airfield",
 529382,"LKJE","heliport","Jesenik Heliport",50.221667,17.186667,1511,"EU","CZ","CZ-OL",,"no","LKJE",,,,,
-29995,"LKJH","small_airport","Jindřichův Hradec Airport",49.150682,14.972413,1667,"EU","CZ","CZ-JC","Jindřichův Hradec","no","LKJH",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Jind%C5%99ich%C5%AFv_Hradec",
+29995,"LKJH","small_airport","Jindřichův Hradec Airfield",49.150682,14.972413,1667,"EU","CZ","CZ-JC","Jindřichův Hradec","no","LKJH",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Jind%C5%99ich%C5%AFv_Hradec",
 29994,"LKJI","small_airport","Jihlava Airfield",49.419399,15.6353,1821,"EU","CZ","CZ-VY","Jihlava","no","LKJI",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Jihlava",
 30046,"LKKA","small_airport","Křižanov Airfield",49.368301,16.1161,1831,"EU","CZ","CZ-VY","Křižanov","no","LKKA",,,,"https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_K%C5%99i%C5%BEanov",
 4397,"LKKB","medium_airport","Kbely Air Base",50.121399,14.5436,939,"EU","CZ","CZ-PR","Prague","no","LKKB",,,,"https://en.wikipedia.org/wiki/Prague%E2%80%93Kbely_Airport",
-30047,"LKKC","small_airport","Kříženec Planá Airport",49.870602,12.7725,2080,"EU","CZ","CZ-PL","Planá","no","LKKC",,,,,
+30047,"LKKC","small_airport","Kříženec Planá Airfield",49.870602,12.7725,2080,"EU","CZ","CZ-PL","Planá","no","LKKC",,,,,
 529383,"LKKE","heliport","Karlov Heliport",49.163889,13.426944,2577,"EU","CZ","CZ-JC",,"no","LKKE",,,,,
 30030,"LKKL","small_airport","Kladno Airfield",50.112801,14.0897,1421,"EU","CZ","CZ-ST","Kladno","no","LKKL",,,"http://letiste-kladno.cz","https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Kladno",
 30049,"LKKM","small_airport","Kroměříž Airfield",49.285599,17.4158,620,"EU","CZ","CZ-ZL","Kroměříž","no","LKKM",,,"http://www.lkkm.cz/","https://cs.wikipedia.org/wiki/Leti%C5%A1t%C4%9B_Krom%C4%9B%C5%99%C3%AD%C5%BE",
@@ -46137,7 +46143,7 @@
 325178,"MX-0566","small_airport","Tampachiche Airport",21.981336,-97.71622,10,"NA","MX","MX-VER","Tampico El Alto","no",,,"THI",,,
 325179,"MX-0567","small_airport","Rancho El Campanero Airport",27.028333,-100.383333,1017,"NA","MX","MX-NLE","Lampazos de Naranjo","no",,,"RCN",,,
 325180,"MX-0568","heliport","Helipuerto Plaza Insurgentes Sur N°1",19.352302,-99.187173,7782,"NA","MX","MX-DIF","Alvaro Obregon","no",,,"HPE",,,
-325181,"MX-0569","small_airport","C.P.A Jesus Ernesto Lozano Jimenez Airport",26.967253,-105.426192,5446,"NA","MX","MX-CHH","Allende","no",,,"ELQ",,"https://es.wikipedia.org/wiki/Aeropuerto_Regional_C.P.A._Jes%C3%BAs_Ernesto_Lozano_Jim%C3%A9nez",
+325181,"MX-0569","small_airport","Captain Jesús Ernesto Lozano Jiménez Regional Airport",26.967253,-105.426192,5446,"NA","MX","MX-CHH","Allende","no",,,"ELQ",,"https://es.wikipedia.org/wiki/Aeropuerto_Regional_C.P.A._Jes%C3%BAs_Ernesto_Lozano_Jim%C3%A9nez",
 325182,"MX-0570","small_airport","Aeromar Airport",24.75709,-107.652073,33,"NA","MX","MX-SIN","General Ángel Flores","no",,,"ARM",,,
 325183,"MX-0571","heliport","Helipuerto Organizacion Editorial Mexicana",19.438423,-99.159725,7391,"NA","MX","MX-DIF","Cuauhtémoc","no",,,"HOE",,,
 325184,"MX-0572","heliport","Helipuerto Centro Corporativo Santander",19.376051,-99.255873,8274,"NA","MX","MX-DIF","Alvaro Obregon","no",,,"HCS",,,
@@ -46507,7 +46513,7 @@
 330065,"MX-0936","heliport","Los Leones Heliport",28.739082,-105.981582,4461,"NA","MX","MX-CHH","Chihuahua","no",,,"HLW",,,
 330066,"MX-0937","heliport","Helimaz Chiapas",14.772546,-92.382491,80,"NA","MX","MX-CHP","Tapachula","no",,,"HLF",,,
 330085,"MX-0938","heliport","Helipuerto C5 Guanajuato",21.010414,-101.513801,5896,"NA","MX","MX-GUA","Silao","no",,,"HZP",,,
-330086,"MX-0939","small_airport","La Frontera Airstrip",27.0403,-105.046919,47,"NA","MX","MX-CHH","Villa Lopez","no",,,"LFR",,,
+330086,"MX-0939","small_airport","La Frontera Airstrip",27.040708,-105.046983,47,"NA","MX","MX-CHH","López","no",,,"LFR",,,"Villa López"
 330111,"MX-0940","heliport","Helipuerto Banorte Tlapan III",19.313581,-99.136832,7460,"NA","MX","MX-DIF","Tlalpan","no",,,"HFB",,,
 330117,"MX-0941","small_airport","Bonito Valle Airport",32.576638,-114.983387,66,"NA","MX","MX-BCN","Mexicali","no",,,"BOV",,,
 330118,"MX-0942","heliport","Helipuerto Tlalnepantla de Baz",19.538852,-99.196356,7474,"NA","MX","MX-MEX","Tlalnepantla de Baz","no",,,"HEZ",,,
@@ -47910,6 +47916,8 @@
 536527,"MX-2339","small_airport","Los Tanques Airport",27.21413,-108.88905,1099,"NA","MX","MX-SON","Álamos","no",,,,,,
 536529,"MX-2340","small_airport","Nuri Airport",28.11116,-109.32804,1273,"NA","MX","MX-SON","Rosario de Tesopaco","no",,,,,,
 536532,"MX-2341","small_airport","San José Babícora Airport",29.26622,-107.75887,7052,"NA","MX","MX-CHH","Gómez Farías","no",,,,,,
+536991,"MX-2342","closed","José Esteban Coronado Airport",26.73239,-105.16983,506,"NA","MX","MX-CHH","Coronado","no",,,,,,"Villa Coronado"
+536993,"MX-2343","closed","Valle de Zaragoza Airport",27.45835,-105.79682,4495,"NA","MX","MX-CHH","Valle de Zaragoza","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)",
@@ -52673,7 +52681,7 @@
 346444,"PL-0203","small_airport","Nowy Tomyśl Airstrip",52.308,16.145643,187,"EU","PL","PL-WP",,"no",,,,,,
 346621,"PL-0204","small_airport","Sławno Airfield",54.39293,16.68227,,"EU","PL","PL-ZP",,"no",,,,,,
 346622,"PL-0205","closed","Lotnisko Stegna-Popowo",54.303729,19.11149,,"EU","PL","PL-PM","Stegna","no",,,,,,
-346667,"PL-0206","small_airport","Trzebicz Nowy Airport",52.799797,15.797546,,"EU","PL","PL-LB","Trzebicz Nowy","no",,,,,,"Lądowisko Trzebicz Nowy, Lotnisko Trzebicz Nowy"
+346667,"PL-0206","small_airport","Trzebicz Nowy Airfield",52.799797,15.797546,,"EU","PL","PL-LB","Trzebicz Nowy","no",,,,,,"Lądowisko Trzebicz Nowy, Lotnisko Trzebicz Nowy"
 346668,"PL-0207","small_airport","Wilkowice Airstrip",51.89456,16.5312,358,"EU","PL","PL-WP","Wilkowice","no",,,,,,
 347043,"PL-0208","small_airport","Lądowisko Ożarów",50.90226,21.65701,,"EU","PL","PL-SK","Ożarów","no",,,,,,
 347088,"PL-0209","small_airport","Lądowisko Tuszów Narodowy",50.373291,21.485116,,"EU","PL","PL-PK",,"no",,,,,,
@@ -58072,7 +58080,7 @@
 35864,"SIBG","heliport","Banco Induscred Helipad",-23.564443,-46.65581,2877,"SA","BR","BR-SP","São Paulo","no","SIBG",,"SP0466",,,
 35865,"SIBH","heliport","Helicidade Helipad",-23.546808,-46.737117,2418,"SA","BR","BR-SP","São Paulo","no","SIBH",,"SP0467",,,
 35866,"SIBI","heliport","GF Taxi Aéreo Heliport",-24.002906,-46.289102,20,"SA","BR","BR-SP","Guarujá","no","SJNT",,"SP0637",,,"SIBI, Tame Guarujá"
-35867,"SIBK","small_airport","Sada Siderurgia Ltda Airport",-17.519443512,-44.7611122131,1759,"SA","BR","BR-MG","Várzea Da Palma","no",,,,,,"SIBK"
+35867,"SIBK","small_airport","Sada Siderurgia Ltda Airport",-17.528285,-44.770122,1759,"SA","BR","BR-MG","Várzea da Palma","no",,,,,,"SIBK"
 35868,"SIBL","heliport","Clínica Porto Dias Heliport",-1.437548,-48.458613,167,"SA","BR","BR-PA","Belém","no","SIBL",,"PA0153",,,
 35869,"SIBM","heliport","Hanger ABC Heliport",-23.61706,-46.580575,2421,"SA","BR","BR-SP","São Caetano do Sul","no","SIBM",,"SP0468",,,
 35870,"SIBN","small_airport","Fazenda Canaã Airport",-23.071388244629,-49.432498931885,2021,"SA","BR","BR-SP","Piraju","no",,,,,,"SIBN"
@@ -58080,7 +58088,7 @@
 35872,"SIBP","heliport","Ambev - Filial Guarulhos Heliport",-23.31861114502,-46.369998931885,2805,"SA","BR","BR-SP","Guarulhos","no",,,,,,"SIBP"
 35873,"SIBQ","heliport","WT Technology Park Heliport",-23.495555877686,-46.813610076904,2487,"SA","BR","BR-SP","Barueri","no",,,,,,"SIBQ"
 35874,"SIBR","heliport","Chacará Recanto Tranquilo Heliport",-20.981943130493,-47.669445037842,2795,"SA","BR","BR-SP","Brodowski","no",,,,,,"SIBR"
-35875,"SIBS","heliport","Terminal Petrobras - São Sebastião Heliport",-23.798610687256,-46.400001525879,16,"SA","BR","BR-SP","São Sebastião","no",,,,,,"SIBS"
+35875,"SIBS","heliport","Terminal Petrobras - São Sebastião Heliport",-23.798586,-45.400049,7,"SA","BR","BR-SP","São Sebastião","no","SJPQ",,"SP0648",,,"SIBS"
 35876,"SIBT","heliport","Transportadora Americana II Heliport",-22.732322,-47.286186,2005,"SA","BR","BR-SP","Americana","no","SIBT",,"SP0471",,,
 223,"SIBU","small_airport","Catolé da Rocha Airport",-6.36253023147583,-37.75619888305664,892,"SA","BR","BR-PB","Catolé Da Rocha","no","SIBU",,"SIBU",,,
 35877,"SIBV","small_airport","Fazenda Bela Vista Airport",-21.448610305786133,-54.488609313964844,1083,"SA","BR","BR-MS","Nova Alvorada Do Sul","no","SIBV",,,,,
@@ -65746,12 +65754,12 @@
 348666,"UPAA","closed","Borok Airfield",58.36023,30.96933,79,"EU","RU","RU-NGR","Borok","no",,,,,,"UPAA, UPAA, UPAA"
 532685,"UPTS","heliport","Truskavets – Rixos Heliport",49.267747,23.496729,1328,"EU","UA","UA-46","Truskavets","no","UPTS",,,"https://rixos.ua/",,"УПТС, Трускавець"
 5994,"URB","closed","Urubupunga Airport",-20.7771,-51.5648,1169,"SA","BR","BR-SP","Castilho","no",,,,,"https://en.wikipedia.org/wiki/Urubupung%C3%A1_Airport","SBUP, URB"
-6511,"URKA","medium_airport","Anapa Vityazevo Airport",45.002102,37.347301,174,"AS","RU","RU-KDA","Krasnyi Kurgan","yes","URKA","AAQ",,"https://www.aaqaero.ru/en/","https://en.wikipedia.org/wiki/Anapa_Airport","Vityazevo Airport"
+6511,"URKA","medium_airport","Anapa Vityazevo Airport",45.002102,37.347301,174,"EU","RU","RU-KDA","Krasnyi Kurgan","yes","URKA","AAQ",,"https://www.aaqaero.ru/en/","https://en.wikipedia.org/wiki/Anapa_Airport","Vityazevo Airport"
 45191,"URKE","medium_airport","Yeysk Airport",46.68,38.21,60,"EU","RU","RU-KDA","Yeysk","yes",,"EIK","URKE",,"https://en.wikipedia.org/wiki/Yeysk_Airport","Eysk Airport, Аэропорт Ейск, УРКЕ, ЬРКЕ"
 315345,"URKF","heliport","Afipsky Heliport",44.873,38.829,80,"EU","RU","RU-KDA","Afipski","no",,,"URKF",,,"УРКФ, Основной"
 31522,"URKG","medium_airport","Gelendzhik Airport",44.5820926295,38.0124807358,98,"EU","RU","RU-KDA","Gelendzhik","yes","URKG","GDZ",,"http://basel.aero/en/gelendjik/","https://en.wikipedia.org/wiki/Gelendzhik_Airport","Аэропорт Геленджик"
 44321,"URKH","medium_airport","Khanskaya Air Base",44.68,40.035,600,"EU","RU","RU-AD","Maykop","no",,,"XRKH",,,"Hanskaya Airport, Аэропорт Ханская"
-6512,"URKK","medium_airport","Krasnodar Pashkovsky International Airport",45.034698,39.170502,118,"AS","RU","RU-KDA","Krasnodar","yes","URKK","KRR",,"https://krr.aero/en/","https://en.wikipedia.org/wiki/Pashkovsky_Airport","Pashkovskiy Airport, Pashkovsky Airport"
+6512,"URKK","medium_airport","Krasnodar Pashkovsky International Airport",45.034698,39.170502,118,"EU","RU","RU-KDA","Krasnodar","yes","URKK","KRR",,"https://krr.aero/en/","https://en.wikipedia.org/wiki/Pashkovsky_Airport","Pashkovskiy Airport, Pashkovsky Airport"
 30125,"URKM","closed","Maykop Airport",44.649374,40.096908,679,"EU","RU","RU-AD","Maykop","no",,,,,,"URKM, URKM"
 44330,"URKR","small_airport","Armavir Air Base",44.968661,41.107408,712,"EU","RU","RU-KDA","Armavir","no","URKR",,,,"https://ru.wikipedia.org/wiki/%D0%90%D1%80%D0%BC%D0%B0%D0%B2%D0%B8%D1%80_(%D0%B0%D1%8D%D1%80%D0%BE%D0%BF%D0%BE%D1%80%D1%82)","Аэродром Армавир"
 44300,"URKS","small_airport","Enem Airfield",44.945999,38.931999,62,"EU","RU","RU-AD","Enem","no","URKS",,,,"https://ru.wikipedia.org/wiki/%D0%AD%D0%BD%D0%B5%D0%BC_(%D0%B0%D1%8D%D1%80%D0%BE%D0%BF%D0%BE%D1%80%D1%82)","Аэропорт Энем"
@@ -65776,7 +65784,7 @@
 44865,"URRT","medium_airport","Taganrog Yuzhny Airport",47.1983333,38.8491667,117,"EU","RU","RU-ROS","Taganrog","yes","URRT","TGK",,"http://www.beriev.com/rus/airport.html","https://ru.wikipedia.org/wiki/Таганрог-Южный_(аэропорт)","Taganrog South Airport, Аэропорт Таганрог Южный"
 43676,"URRW","small_airport","Veshenskaya Airport",49.656601,41.700699,253,"EU","RU","RU-ROS",,"no",,,"URRW",,,"Vyoshenskaya Airport, Аэропорт Вешенская, Аэропорт Вёшенская, УРРВ"
 43678,"URRY","closed","Volgodonsk Airport",47.682098,42.0728,276,"EU","RU","RU-ROS",,"no",,,,,,"Tsimlyansk Airport, Аэропорт Волгодонск, Аэропорт Цимлянск, URRQ, VLK"
-6519,"URSS","large_airport","Sochi International Airport",43.449902,39.9566,89,"AS","RU","RU-KDA","Sochi","yes","URSS","AER",,"https://aer.aero/en","https://en.wikipedia.org/wiki/Sochi_International_Airport","Adler Airport, Black Sea, Международный Аэропорт Сочи"
+6519,"URSS","large_airport","Sochi International Airport",43.449902,39.9566,89,"EU","RU","RU-KDA","Sochi","yes","URSS","AER",,"https://aer.aero/en","https://en.wikipedia.org/wiki/Sochi_International_Airport","Adler Airport, Black Sea, Международный Аэропорт Сочи"
 6520,"URWA","medium_airport","Astrakhan Narimanovo Boris M. Kustodiev International Airport",46.282843,48.010511,-65,"AS","RU","RU-AST","Astrakhan","yes","URWA","ASF",,"http://xn--80aaaa9dcahhdbllc1cxhc.xn--p1ai/","https://en.wikipedia.org/wiki/Narimanovo_Airport","Astrahan Airport, Narimanovo Airport, Аэропорт Астрахань, Аэропорт Нариманово"
 6521,"URWI","medium_airport","Elista Airport",46.3739013671875,44.33089828491211,501,"EU","RU","RU-KL","Elista","yes","URWI","ESL",,,"https://en.wikipedia.org/wiki/Elista_Airport",
 6522,"URWW","medium_airport","Volgograd International Airport",48.782501220703125,44.34550094604492,482,"EU","RU","RU-VGG","Volgograd","yes","URWW","VOG",,,"https://en.wikipedia.org/wiki/Volgograd_International_Airport","Gumrak Airport, Аэропорт Волгоград, Аэропорт Гумрак"
@@ -74457,6 +74465,8 @@
 536731,"US-8659","closed","Skanee Airport",46.86429,-88.20989,859,"NA","US","US-MI","Skanee","no",,,,,,
 536733,"US-8660","closed","Chatcolet Airport",47.42438,-117.09157,2448,"NA","US","US-WA","Rockford","no",,,,,,
 536847,"US-8661","small_airport","Campo Airport",37.1142,-102.59026,4364,"NA","US","US-CO","Campo","no",,,,,,
+536984,"US-8662","closed","Maynard Airport",42.14443,-95.96609,1072,"NA","US","US-IA","Castana","no",,,,,,
+536985,"US-8663","closed","Onserud Airfield",48.31302,-117.29118,2054,"NA","US","US-WA","Usk","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"
@@ -76080,7 +76090,7 @@
 45886,"WA19","heliport","Berkley Structures Heliport",47.681996,-122.148491,50,"NA","US","US-WA","Redmond","no","WA19",,"WA19",,,
 3268,"WA1B","small_airport","Aru Airport",-6.57342004776001,134.14700317382812,165,"AS","ID","ID-MA","Fekfetal / Jerdera-Trangan Island","no","WA1B",,"WA1B",,,
 25617,"WA20","closed","Gray Ranch Airport",46.83995,-118.176531,1625,"NA","US","US-WA","Benge","no",,,,,,"WA20"
-25618,"WA21","small_airport","Elk Heights Airport",48.001999,-117.263333,2050,"NA","US","US-WA","Elk","no","WN04",,"WN04",,,"WA21"
+25618,"WA21","small_airport","Elk Heights Airport",47.99987,-117.263577,2050,"NA","US","US-WA","Elk","no","WN04",,"WN04",,,"WA21"
 25619,"WA22","small_airport","Mirth Airport",47.9385986328125,-122.60800170898438,190,"NA","US","US-WA","Hansville","no","WA22",,"WA22",,,
 25620,"WA23","small_airport","Pine Bluff Airport",48.020999908447266,-117.73899841308594,2021,"NA","US","US-WA","Springdale","no","WA23",,"WA23",,,
 25621,"WA24","small_airport","Pfister's Airport",46.396900177,-119.021003723,625,"NA","US","US-WA","Pasco","no","WA24",,"WA24",,,
diff --git a/runways.csv b/runways.csv
index b6ba58526..9c9d0733d 100644
--- a/runways.csv
+++ b/runways.csv
@@ -35331,7 +35331,7 @@
 263166,35872,"SIBP",92,92,"CON",0,0,"2",,,,,,"23",,,,,
 263238,35873,"SIBQ",59,59,"GRS",0,0,"H1",,,,,,"H1",,,,,
 262990,35874,"SIBR",69,69,"CON",0,0,"12",,,,,,,,,,,
-262811,35875,"SIBS",62,62,"CON",0,0,"12",,,,,,,,,,,
+262811,35875,"SIBS",64,64,"CON",1,0,"12",,,,,,,,,,,
 262897,35876,"SIBT",66,66,"CON",0,0,"15",,,,,,,,,,,
 233786,223,"SIBU",3281,66,"ASP",0,0,"11",,,,,,"29",,,,,
 262168,35877,"SIBV",2625,98,"GRE",0,0,"17",,,,,,"35",,,,,