diff --git a/airports.csv b/airports.csv
index da6a1e27a..34ade474a 100644
--- a/airports.csv
+++ b/airports.csv
@@ -9256,7 +9256,7 @@
 14574,"82NM","small_airport","Skeen Ranch Airport",33.16879,-105.133201,5524,"NA","US","US-NM","Hondo","no","82NM",,"82NM",,,
 504715,"82NR","small_airport","Big Sandy Landing",35.673812,-82.806628,2210,"NA","US","US-NC","Canton","no","82NR",,"82NR",,,
 299714,"82NY","small_airport","Silvernails Field",42.001389,-73.67111,571,"NA","US","US-NY","Gallatin","no","82NY",,"82NY",,,
-14575,"82OH","small_airport","Rocky Ridge Airpark",41.5078010559082,-83.77130126953125,650,"NA","US","US-OH","Waterville","no","82OH",,"82OH",,,
+14575,"82OH","closed","Rocky Ridge Airpark",41.507801,-83.771301,650,"NA","US","US-OH","Waterville","no",,,,,,"82OH"
 14576,"82OI","small_airport","J-Em Farm Airport",40.15420150756836,-83.27490234375,1005,"NA","US","US-OH","Columbus","no","82OI",,"82OI",,,
 14577,"82OK","heliport","Ascension Saint John Sapulpa Heliport",35.993146,-96.099575,750,"NA","US","US-OK","Sapulpa","no","82OK",,"82OK",,,
 14578,"82OR","small_airport","Lost Creek Airport",43.89929962158203,-122.81700134277344,700,"NA","US","US-OR","Dexter","no","82OR",,"82OR",,,
@@ -17351,7 +17351,7 @@
 335911,"CAA3","heliport","Westlock Healthcare Centre Heliport",54.1466,-113.854998,2153,"NA","CA","CA-AB","Westloc","no","CAA3",,"CAA3","https://www.albertahealthservices.ca/findhealth/facility.aspx?id=1044401",,
 339349,"CAA4","small_airport","Saint-Apollinaire (Airpro) Aerodrome",46.586944,-71.561111,380,"NA","CA","CA-QC","Saint-Apollinaire","no","CAA4",,"CAA4",,"https://en.wikipedia.org/wiki/Saint-Apollinaire_(Airpro)_Aerodrome",
 28471,"CAA5","seaplane_base","Zeballos Seaplane Base",49.9778,-126.8445,0,"NA","CA","CA-BC","Zeballos","no","CAA5",,"CAA5",,"https://en.wikipedia.org/wiki/Zeballos_Water_Aerodrome","AA5"
-611,"CAA6","heliport","Smithers (Canadian) Heliport",54.772295,-127.141599,1600,"NA","CA","CA-BC","Smithers","no","CAA6",,"CAA6",,,"AA6"
+611,"CAA6","heliport","Smithers (Canadian) Heliport",54.772295,-127.141599,1600,"NA","CA","CA-BC","Smithers","no","CAA6",,"CAA6",,,
 28237,"CAA7","seaplane_base","Gilford Island/Echo Bay Seaplane Base",50.766701,-126.483002,,"NA","CA","CA-BC","Gilford Island","yes","CAA7",,"CAA7",,"https://en.wikipedia.org/wiki/Gilford_Island/Echo_Bay_Water_Aerodrome","AA7"
 612,"CAA8","small_airport","Invermere Airport",50.521502,-116.005775,2820,"NA","CA","CA-BC","Invermere","no","CAA8",,"CAA8",,"https://en.wikipedia.org/wiki/Invermere_Airport","AA8"
 28374,"CAA9","seaplane_base","Port Alberni/Sproat Lake Seaplane Base",49.2891524507,-124.937746525,95,"NA","CA","CA-BC","Sproat Lake","no","CAA9",,"CAA9",,"https://en.wikipedia.org/wiki/Port_Alberni/Sproat_Lake_Water_Aerodrome","AA9"
@@ -17465,7 +17465,7 @@
 653,"CAW4","heliport","Whistler (Hospital) Heliport",50.120253,-122.954679,2182,"NA","CA","CA-BC","Whistler","no","CAW4",,"CAW4",,,
 28378,"CAW5","seaplane_base","Port Hardy Seaplane Base",50.716702,-127.483002,,"NA","CA","CA-BC","Port Hardy","no","CAW5",,"CAW5",,"https://en.wikipedia.org/wiki/Port_Hardy_Water_Aerodrome",
 28232,"CAW6","seaplane_base","Fort Ware Seaplane Base",57.4236,-125.6442,2480,"NA","CA","CA-BC",,"no","CAW6",,"CAW6",,"https://en.wikipedia.org/wiki/Fort_Ware_Water_Aerodrome","AW6"
-28315,"CAW7","seaplane_base","Mayne Island Seaplane Base",48.852241,-123.301982,,"NA","CA","CA-BC","Miners Bay","yes",,,,,"https://en.wikipedia.org/wiki/Mayne_Island_Water_Aerodrome","YAV, CAW7"
+28315,"CAW7","seaplane_base","Mayne Island Seaplane Base",48.852241,-123.301982,,"NA","CA","CA-BC","Miners Bay","yes",,"YAV",,,"https://en.wikipedia.org/wiki/Mayne_Island_Water_Aerodrome","CAW7"
 28175,"CAW8","seaplane_base","Bella Bella/Shearwater Seaplane Base",52.150002,-128.08299,0,"NA","CA","CA-BC","Bella Bella","no","CAW8","YSX","CAW8",,"https://en.wikipedia.org/wiki/Bella_Bella/Shearwater_Water_Aerodrome","AW8"
 28463,"CAW9","seaplane_base","Whaletown Seaplane Base",50.108504,-125.051001,0,"NA","CA","CA-BC",,"no","CAW9",,"CAW9",,"https://en.wikipedia.org/wiki/Whaletown_Water_Aerodrome","AW9"
 44374,"CAX2","small_airport","Axe Lake Aerodrome",57.269165,-109.847504,1758,"NA","CA","CA-SK","Axe Lake","no","CAX2",,"CAX2",,"https://en.wikipedia.org/wiki/Axe_Lake_Aerodrome",
@@ -30513,7 +30513,7 @@
 325377,"ID-0177","small_airport","Basiem Airport",-6.058573,138.383542,49,"AS","ID","ID-PS","Basiem","no",,,"BAS",,,
 325386,"ID-0178","small_airport","Awimbon Airstrip",-5.165884,140.381568,492,"AS","ID","ID-PP","Awimbon","yes",,,"AWI",,,"Awinbon"
 329576,"ID-0179","small_airport","Anik Airstrip",0.537465,109.742062,139,"AS","ID","ID-KB","Anik","no",,,"ANI",,,
-329620,"ID-0180","small_airport","Yaosakor Airstrip",-5.603899,138.46525,10,"AS","ID","ID-PS","Yaosakor","no",,,"YAO",,,
+329620,"ID-0180","small_airport","Yaosakor Airstrip",-5.603899,138.46525,10,"AS","ID","ID-PS","Yaosakor","no","WRMJ",,"YAO",,,
 329625,"ID-0181","small_airport","Weda Bay Airport",0.468328,127.945101,11,"AS","ID","ID-MU",,"no","WAEH",,,,,
 337306,"ID-0182","heliport","Pemping Helipad",1.103007,103.797455,95,"AS","ID","ID-KR","Batam City","no",,,,,,
 342202,"ID-0183","heliport","Landasan Heliport",-6.14067,106.1983,89,"AS","ID","ID-BT","Serang","no",,,,,,