diff --git a/airports.csv b/airports.csv
index fab8be9fd..fbce30771 100644
--- a/airports.csv
+++ b/airports.csv
@@ -5745,7 +5745,7 @@
 11545,"4ME4","seaplane_base","Lovewell Pond Seaplane Base",44.00680160522461,-70.93360137939453,390,"NA","US","US-ME","Fryeburg","no","4ME4",,"4ME4",,,
 331721,"4ME9","heliport","Norway Heliport",44.209319,-70.531705,380,"NA","US","US-ME","Norway","no","4ME9",,"4ME9",,,"Stephens Memorial Hospital"
 11546,"4MI0","closed","Kriewall Strip",42.8381,-82.968803,765,"NA","US","US-MI","Romeo","no",,,,,,"4MI0"
-11547,"4MI1","small_airport","Air Rahe Airport",41.829522,-83.6849,680,"NA","US","US-MI","Petersburg","no","4MI1",,"4MI1",,,
+11547,"4MI1","small_airport","Air Rahe Airport",41.829522,-83.6849,680,"NA","US","US-MI","Petersburg","no","4MI1",,"4MI1",,,"Air Rahe Ultra-Park"
 345415,"4MI2","heliport","McLaren Lapeer Region Heliport",43.063695,-83.321053,855,"NA","US","US-MI","Lapeer","no","4MI2",,"4MI2",,,
 11548,"4MI3","closed","Phil's Field",42.72602,-86.040673,685,"NA","US","US-MI","Overisel","no",,,,,,"4MI3, 4MI3, 4MI3"
 11549,"4MI4","small_airport","Whitcomb Field",42.1781005859375,-85.6707992553711,915,"NA","US","US-MI","Schoolcraft","no","4MI4",,"4MI4",,,
@@ -6240,7 +6240,7 @@
 332479,"53NV","heliport","Battle Mountain EMS Heliport",40.641031,-116.940891,4515,"NA","US","US-NV","Battle Mountain","no","53NV",,"53NV",,,
 11972,"53NY","small_airport","Smiths Land Base Airport",42.95840072631836,-77.61579895019531,627,"NA","US","US-NY","Honeoye Falls","no","53NY",,"53NY",,,
 11973,"53OH","small_airport","Charloe Airport",41.134498596191406,-84.45079803466797,721,"NA","US","US-OH","Paulding","no","53OH",,"53OH",,,
-11974,"53OI","heliport","Metro Health Medical Center Heliport",41.460899353027344,-81.69760131835938,690,"NA","US","US-OH","Cleveland","no","53OI",,"53OI",,,
+11974,"53OI","heliport","MetroHealth Medical Center Heliport",41.460678,-81.698715,781,"NA","US","US-OH","Cleveland","no","53OI",,"53OI",,,
 11975,"53OK","small_airport","Thompson Private Airport",35.24284,-97.76384,1280,"NA","US","US-OK","Tuttle","no","53OK",,"53OK",,,
 11976,"53OR","heliport","Providence Saint Vincent Medical Center Heliport",45.510905,-122.774102,478,"NA","US","US-OR","Beaverton","no","53OR",,"53OR",,"https://en.wikipedia.org/wiki/Providence_St._Vincent_Medical_Center","St Vincent Hospital Heliport"
 11977,"53PA","heliport","Ritz 2 Heliport",40.92060089111328,-76.99140167236328,625,"NA","US","US-PA","Mifflinburg","no","53PA",,"53PA",,,
@@ -7260,7 +7260,7 @@
 12877,"62NM","small_airport","Seven Rivers Airport",32.597746,-104.426766,3360,"NA","US","US-NM","Carlsbad","no","62NM",,"62NM",,,
 45546,"62NY","heliport","Adirondack Helicopters Heliport",44.43515,-75.472217,449,"NA","US","US-NY","Gouverneur","no","62NY",,"62NY",,,
 12878,"62OH","small_airport","Willard Field",39.694503,-82.467542,820,"NA","US","US-OH","Lancaster","no","62OH",,"62OH",,,
-12879,"62OI","heliport","Parma Community Hospital Heliport",41.38119888305664,-81.73179626464844,931,"NA","US","US-OH","Parma","no","62OI",,"62OI",,,
+12879,"62OI","heliport","University Health Parma Medical Center Heliport",41.382258,-81.731973,931,"NA","US","US-OH","Parma","no","62OI",,"62OI",,,"Parma Community Hospital Heliport"
 12880,"62OK","small_airport","Lewis North Airport",36.33919906616211,-94.92040252685547,960,"NA","US","US-OK","Jay","no","62OK",,"62OK",,,
 12881,"62OR","heliport","Cinder Butte Heliport",44.32170104980469,-121.19300079345703,2950,"NA","US","US-OR","Redmond","no","62OR",,"62OR",,,
 12882,"62PA","small_airport","Shreveport North Airport",40.03620147705078,-76.99549865722656,550,"NA","US","US-PA","Wellsville","no","62PA",,"62PA",,,
@@ -7960,7 +7960,7 @@
 13474,"6OI4","heliport","Marion General Hospital Heliport",40.57120132446289,-83.12909698486328,998,"NA","US","US-OH","Marion","no","6OI4",,"6OI4",,,
 13475,"6OI5","small_airport","Mitchell Airport",40.137298583984375,-83.21800231933594,950,"NA","US","US-OH","Plain City","no","6OI5",,"6OI5",,,
 13476,"6OI6","heliport","ProMedica Toledo Hospital Heliport",41.673261,-83.594624,648,"NA","US","US-OH","Toledo","no","6OI6",,"6OI6",,,
-13477,"6OI8","heliport","Cleveland Clinic Foundation Heliport",41.5018056,-81.6386833,743,"NA","US","US-OH","Cleveland","no","6OI8",,"6OI8",,,
+13477,"6OI8","heliport","Cleveland Clinic Foundation Heliport",41.500619,-81.622308,743,"NA","US","US-OH","Cleveland","no","6OI8",,"6OI8",,,
 13478,"6OI9","heliport","Red Roof Inns Heliport",40.05009841918945,-83.1270980834961,873,"NA","US","US-OH","Columbus","no","6OI9",,"6OI9",,,
 13479,"6OK0","small_airport","White Airport",35.89139938354492,-97.95890045166016,1110,"NA","US","US-OK","Kingfisher","no","6OK0",,"6OK0",,,
 13480,"6OK1","small_airport","John Reid Airport",36.00149917602539,-95.00299835205078,831,"NA","US","US-OK","Tahlequah","no","6OK1",,"6OK1",,,
@@ -8500,7 +8500,7 @@
 13942,"77NJ","heliport","Liberty State Park Heliport",40.693199157714844,-74.05370330810547,3,"NA","US","US-NJ","Jersey City","no","77NJ",,"77NJ",,,
 348209,"77NV","small_airport","Flying Eagle Airport",39.84355,-119.6865,4222,"NA","US","US-NV","Reno","no","77NV",,"77NV",,,
 13944,"77OH","small_airport","Collins-Flege Airpark",39.36280059814453,-84.34130096435547,860,"NA","US","US-OH","Mason","no","77OH",,"77OH",,,
-13945,"77OI","heliport","University Hospitals of Cleveland Heliport",41.50590133666992,-81.60489654541016,761,"NA","US","US-OH","Cleveland","no","77OI",,"77OI",,,
+13945,"77OI","heliport","University Hospitals of Cleveland Heliport",41.506054,-81.605271,761,"NA","US","US-OH","Cleveland","no","77OI",,"77OI",,,
 13946,"77OK","heliport","Oklahoma National Guard Heliport",35.503044,-97.468178,1190,"NA","US","US-OK","Oklahoma City","no","77OK",,"77OK",,,
 13947,"77OR","heliport","BLM Heliport",44.2790217965,-120.902110934,3250,"NA","US","US-OR","Prineville","no","77OR",,"77OR",,"https://en.wikipedia.org/wiki/BLM_Heliport",
 13948,"77PA","small_airport","Nardo Airport",40.58340072631836,-79.8998031616211,1140,"NA","US","US-PA","Allison Park","no","77PA",,"77PA",,,
@@ -23716,7 +23716,7 @@
 29242,"EKRD","small_airport","Randers Airfield",56.506599,10.0364,139,"EU","DK","DK-82","Randers","no","EKRD",,,,"https://en.wikipedia.org/wiki/Randers_Airport",
 44019,"EKRF","heliport","Rolf Helideck",55.60615539550781,4.4913330078125,,"EU","DK","DK-XX",,"no","EKRF",,,,,
 2551,"EKRK","medium_airport","Copenhagen Roskilde Airport",55.585602,12.1314,146,"EU","DK","DK-85","Copenhagen","yes","EKRK","RKE",,,"https://en.wikipedia.org/wiki/Roskilde_Airport","København"
-2552,"EKRN","medium_airport","Bornholm Airport",55.06330108642578,14.759599685668945,52,"EU","DK","DK-84","Rønne","yes","EKRN","RNN",,"http://www.bornholms-lufthavn.dk/en/","https://en.wikipedia.org/wiki/Bornholm_Airport","Roenne"
+2552,"EKRN","medium_airport","Bornholm Airport",55.063301,14.7596,52,"EU","DK","DK-84","Rønne","yes","EKRN","RNN",,"http://www.bornholms-lufthavn.dk/en/","https://en.wikipedia.org/wiki/Bornholm_Airport","Roenne"
 29243,"EKRR","closed","Ro Airport",55.2103004456,14.878600120500002,325,"EU","DK","DK-84","Ro","no",,,,,,"EKRR, EKRR"
 29244,"EKRS","small_airport","Ringsted Airfield",55.4258,11.8067,113,"EU","DK","DK-85","Ringsted","yes","EKRS",,,,"https://da.wikipedia.org/wiki/Ringsted_Flyveplads",
 29245,"EKSA","small_airport","Sæby (Ottestrup) Airfield",57.346699,10.407,110,"EU","DK","DK-81","Sæby","no","EKSA",,,,,"Saeby"
@@ -43724,7 +43724,7 @@
 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",,,
-21750,"M84","small_airport","Erie Aerodrome",41.7831,-83.516899,605,"NA","US","US-MI","Erie","no","M84",,"M84",,"https://en.wikipedia.org/wiki/Erie_Aerodrome",
+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"
 353212,"MA-0001","heliport","Cheikh Khalifa Bin Zayed Al Nahyan Hospital Heliport",33.55178,-7.66799,194,"AF","MA","MA-CAS","Casablanca","no",,,,,,
@@ -44352,7 +44352,7 @@
 22064,"MI51","closed","Loars Field",41.996895,-84.188599,995,"NA","US","US-MI","Onsted","no",,,,,,"MI51"
 22065,"MI52","small_airport","Markham Airport",42.090599060058594,-83.96800231933594,825,"NA","US","US-MI","Clinton","no","MI52",,"MI52",,,
 22066,"MI53","small_airport","Mills Field",42.00920104980469,-83.25830078125,590,"NA","US","US-MI","Newport","no","MI53",,"MI53",,,
-22067,"MI54","heliport","Helifarm Heliport",41.79359817504883,-83.53810119628906,610,"NA","US","US-MI","Monroe","no","MI54",,"MI54",,,
+22067,"MI54","heliport","Helifarm Heliport",41.79352,-83.538129,610,"NA","US","US-MI","Temperance","no","MI54",,"MI54",,,
 22068,"MI55","closed","Zeitler Airport",43.490002,-84.365303,678,"NA","US","US-MI","Merril","no",,,,,,"MI55"
 22069,"MI56","small_airport","Boulder Canyon Airport",43.075769,-85.268283,987,"NA","US","US-MI","Belding","no",,,"56C",,,"MI56"
 22070,"MI57","heliport","Eagle Heliport",42.79309844970703,-83.0261001586914,605,"NA","US","US-MI","Romeo","no","MI57",,"MI57",,,
@@ -50315,7 +50315,7 @@
 23734,"OI90","closed","Sheriff's Heliport",40.614201,-83.108498,991,"NA","US","US-OH","Marion","no",,,,,,"OI90"
 23735,"OI91","small_airport","Hammond Airport",39.779701232910156,-83.9092025756836,990,"NA","US","US-OH","Yellow Springs","no","OI91",,"OI91",,,
 23736,"OI92","closed","Conklin Airport",41.391701,-83.7033,675,"NA","US","US-OH","Bowling Green","no",,,,,,"OI92"
-23737,"OI93","heliport","Alaimo's Heliport",41.3400993347168,-81.61009979248047,760,"NA","US","US-OH","Brecksville","no","OI93",,"OI93",,,
+23737,"OI93","heliport","Alaimo's Heliport",41.339713,-81.610356,760,"NA","US","US-OH","Brecksville","no","OI93",,"OI93",,,
 23738,"OI94","heliport","9 Newsport Heliport",39.08340072631836,-84.51239776611328,550,"NA","US","US-OH","Cincinnati","no","OI94",,"OI94",,,
 23739,"OI95","heliport","Children's Hospital Heliport",39.95370101928711,-82.9813003540039,785,"NA","US","US-OH","Columbus","no","OI95",,"OI95",,,
 23740,"OI96","heliport","National Heliport",39.93510055541992,-82.83180236816406,798,"NA","US","US-OH","Columbus","no","OI96",,"OI96",,,
@@ -53574,7 +53574,7 @@
 322817,"RO-0025","small_airport","Aerodromul Topoloveni",44.7966246,25.0896598,,"EU","RO","RO-AG","Topoloveni","no",,,,,,
 323634,"RO-0026","small_airport","Salonti Airstrip",45.9416179,23.7606823,,"EU","RO","RO-AB",,"no",,,,,,
 323671,"RO-0027","small_airport","Aerodromul Ciceu-Andras",46.3927664,25.7776699,,"EU","RO","RO-HR","Miercurea Ciuc","no",,,,,,
-325342,"RO-0028","small_airport","Ghindari Airfield",46.5189842,24.943781,,"EU","RO","RO-MS","Ghindari","no",,,,,,
+325342,"RO-0028","small_airport","Ghindari Airfield",46.519304,24.945037,,"EU","RO","RO-MS","Ghindari","no",,,,,,"Aerodrom Ghindari"
 335080,"RO-0029","heliport","General Inspectorate of Aviation Bucharest Heliport",44.504177,26.098731,,"EU","RO","RO-B","Bucharest","no",,,,,,
 342108,"RO-0030","heliport","Telecabina Heliport",45.5883,25.5508,3399,"EU","RO","RO-BV","Brașov","no",,,,,,
 329751,"RO-0031","small_airport","Aerodrom Crasna",47.1679879,22.8559184,,"EU","RO","RO-SJ","Crasna","no",,,,,,
@@ -53789,7 +53789,7 @@
 34944,"RU-0009","closed","Bakhmutovo Air Base",56.371700286865234,34.08829879760742,699,"EU","RU","RU-TVE","Rzhev","no",,,,,"https://en.wikipedia.org/wiki/Bakhmutovo",
 34945,"RU-0010","medium_airport","Balashov Air Base",51.533298,43.299999,568,"EU","RU","RU-SAR","Balashov","no",,,"XWSW",,"https://en.wikipedia.org/wiki/Balashov_%28air_base%29",
 34947,"RU-0011","closed","Baltiysk Air Base",54.61000061035156,19.86829948425293,10,"EU","RU","RU-KGD","Baltiysk","no",,,,,"https://en.wikipedia.org/wiki/Baltiysk_%28air_base%29",
-34949,"RU-0012","closed","Khariusny Air Base (closed)",67.379729,34.215661,427,"EU","RU","RU-MUR","Umbozero","no",,,,,"https://en.wikipedia.org/wiki/Berezovka","Khariusnaya Airfield, Berezovka Airfield, Umbozero South, Аэродром Хариусный, Аэродром Хариусная, XLMH"
+34949,"RU-0012","closed","Khariusny Air Base (closed)",67.379729,34.215661,427,"AS","RU","RU-MUR","Umbozero","no",,,,,"https://en.wikipedia.org/wiki/Berezovka_(air_base)","Khariusnaya Airfield, Berezovka Airfield, Umbozero South, Аэродром Хариусный, Аэродром Хариусная, XLMH, ЬЛМХ"
 34950,"RU-0013","closed","Bezrechnaya-2 Air Base",50.75,116.217003,2201,"AS","RU","RU-CHI","Mirnaya","no",,,,,"https://en.wikipedia.org/wiki/Bezrechnaya-2","Bezrechnaya, Bezrechnoy, Khodabulak, Khada Bulak North, Mirnaya"
 34953,"RU-0014","medium_airport","Borisoglebsk Air Base",51.366699,42.178299,390,"EU","RU","RU-VOR","Borisoglebsk","no",,,"XUOB",,"https://en.wikipedia.org/wiki/Borisoglebsk_%28air_base%29","Аэродром Борисоглебск"
 34955,"RU-0015","medium_airport","Khotilovo Air Base",57.654999,34.099998,591,"EU","RU","RU-TVE","Bologoye","no",,,"XUEH",,"https://en.wikipedia.org/wiki/Borisovsky_Khotilovo","Khatilovo Air Base, Borisovskiy Air Base, Borisovsky Air Base, Аэродром Хотилово, Аэродром Борисовский"
@@ -54830,7 +54830,7 @@
 34983,"RU-2844","medium_airport","Dzhida Air Base",50.677425,106.138573,1968,"AS","RU","RU-BU","Dzhida","no","UIID",,,,"https://en.wikipedia.org/wiki/Dzhida","Аэродром Джида, ЬИИД"
 35077,"RU-3095","small_airport","Shadrinsk Air Base",56.039207,63.681995,459,"AS","RU","RU-KGN","Shadrinsk","no","XSCD",,,,"https://en.wikipedia.org/wiki/Shadrinsk_(air_base)",
 35096,"RU-3106","closed","Tiksi North Air Base",72.03829956054688,128.4720001220703,66,"AS","RU","RU-SA","Tiksi","no",,,,,"https://en.wikipedia.org/wiki/Tiksi_North",
-35105,"RU-3288","small_airport","Umbozero Air Base",67.513427,34.30687,518,"EU","RU","RU-MUR","Umbozero","no",,,"XLMU",,"https://en.wikipedia.org/wiki/Umbozero_(airport)",
+35105,"RU-3288","closed","Umbozero Air Base",67.513427,34.30687,518,"EU","RU","RU-MUR","Umbozero","no",,,,,"https://en.wikipedia.org/wiki/Umbozero_(air_base)","XLMU"
 35056,"RU-3463","closed","Poduzhemye Air Base",64.91829681396484,34.26499938964844,157,"EU","RU","RU-KR",,"no",,,,,"https://en.wikipedia.org/wiki/Poduzhemye","Kem/Uzhmana, Uzhmana"
 35027,"RU-3540","closed","Luostari Air Base",69.400002,30.9883,249,"EU","RU","RU-MUR","Zapolyarnyj","no",,,,,"https://en.wikipedia.org/wiki/Luostari/Pechenga_(air_base)","Pechenga, Korzunovo Air Base, Аэродром Луостари, Аэродром Корзуново, XLML"
 35116,"RU-3686","medium_airport","Oreshkovo",54.4683,36.073299,545,"EU","RU","RU-KLU","Kaluga","no",,,"UUFO",,"https://en.wikipedia.org/wiki/Vorotynsk_(air_base)","Oreshkovo Air Base, Аэродром Воротынск, Аэродром Орешково"
@@ -56666,10 +56666,10 @@
 350359,"SDO7","heliport","Frisonfly Heliport",-2.872222,-40.398333,105,"SA","BR","BR-CE","Cruz","no","SDO7",,"CE0151",,,
 351527,"SDO8","heliport","Wave Iriri Anchieta Heliport",-20.811303,-40.663842,66,"SA","BR","BR-ES","Anchieta","no","SDO8",,"ES0050",,,
 351529,"SDO9","small_airport","True Type Airport",-19.443856,-44.490671,2441,"SA","BR","BR-MG","Inhaúma","no","SDO9",,"MG0510",,,
-46107,"SDOA","small_airport","Lagoa da Floresta Airport",-5.488611111110001,-45.4886111111,591,"SA","BR","BR-MA","Barra Do Corda","no","SDOA",,"SDOA",,,
-191,"SDOB","small_airport","Fazenda São José ""OB"" Airport",-21.425199508666992,-46.75429916381836,2585,"SA","BR","BR-SP","Tapiratiba","no","SDOB",,"SDOB",,,
-35652,"SDOC","heliport","Hospital do Coração Heliport",-23.573055267333984,-46.6430549621582,2825,"SA","BR","BR-SP","São Paulo","no","SDOC",,,,,
-46103,"SDOD","small_airport","Fazenda Vida Airport",-5.84,-45.5419444444,820,"SA","BR","BR-MA","Barra Do Corda","no","SDOD",,"SDOD",,,
+46107,"SDOA","small_airport","Fazenda Lagoa da Floresta Airport",-5.486818,-45.083058,627,"SA","BR","BR-MA","Barra do Corda","no","SDOA",,"MA0013",,,
+191,"SDOB","small_airport","Fazenda São José O.B. Airport",-21.4252,-46.754299,2634,"SA","BR","BR-SP","Tapiratiba","no","SDOB",,"SP0129",,,
+35652,"SDOC","heliport","Hospital do Coração Heliport",-23.573127,-46.643565,2835,"SA","BR","BR-SP","São Paulo","no","SDOC",,"SP0392",,,
+46103,"SDOD","small_airport","Fazenda Vida Airport",-5.837362,-45.530848,820,"SA","BR","BR-MA","Barra Do Corda","no","SDOD",,"MA0014",,,
 46102,"SDOE","small_airport","Fazenda Sibéria Airport",-5.72222222222,-45.7913888889,741,"SA","BR","BR-MA","Grajaú","no","SDOE",,"SDOE",,,
 35653,"SDOF","heliport","Enseadinha Heliport",-8.549722,-35.007221,16,"SA","BR","BR-PE","Ipojuca","no","SDKS",,"PE0023",,,"SDOF, Serrambi Heliport"
 35654,"SDOG","heliport","Península Heliport",-23.996944427490234,-46.20305633544922,236,"SA","BR","BR-SP","Guarujá","no","SDOG",,,,,
@@ -64916,11 +64916,11 @@
 351110,"UA-0165","closed","Frumushyka Airstrip",46.29002,29.40827,436,"EU","UA","UA-51","Semysotka","no",,,,,,
 351111,"UA-0166","heliport","Frumushyka Heliport",46.29598,29.41779,418,"EU","UA","UA-51","Semysotka","no",,,,,,
 351112,"UA-0167","heliport","Yuzhniy Heliport",44.57702,33.49612,278,"EU","UA","UA-40","Sevastopol","no",,,,,,
-351113,"UA-0168","small_airport","Chaplynka Airport",46.34539,33.54191,72,"EU","UA","UA-65","Chaplynka","no",,,,,,
-351114,"UA-0169","small_airport","Vesele Airport",47.0369,34.91204,253,"EU","UA","UA-23","Vesele","no",,,,,,
+351113,"UA-0168","small_airport","Chaplynka Airfield",46.34539,33.54191,72,"EU","UA","UA-65","Chaplynka","no",,,,,,"UKOY"
+351114,"UA-0169","small_airport","Vesele Airfield",47.0369,34.91204,253,"EU","UA","UA-23","Vesele","no",,,,,,"UKSW"
 351115,"UA-0170","small_airport","Shyroke Airfield",46.94635,34.91222,238,"EU","UA","UA-23","Shyroke","no",,,,,,"UPSR"
 351422,"UA-0171","closed","Prymors'k Airport",46.7441,36.32766,89,"EU","UA","UA-23","Prymors'k","no",,,,,,
-351423,"UA-0172","small_airport","Korsak Airport",46.7513,35.6342,115,"EU","UA","UA-23","Pryazovs'ke","no",,,,,,
+351423,"UA-0172","small_airport","Korsak Airfield",46.7513,35.6342,115,"EU","UA","UA-23","Pryazovs'ke","no",,,,,,"UKTK"
 352972,"UA-0173","small_airport","Hlukhiv Airfield",51.68335,33.87135,577,"EU","UA","UA-59","Hlukhiv","no",,,,,,"UPGL"
 353018,"UA-0174","heliport","Zmiyinyy Island Helipad",45.255778,30.201306,,"EU","UA","UA-51",,"no",,,,,,
 353019,"UA-0175","closed","Holubivka Airfield",48.63034,38.67211,672,"EU","UA","UA-14","Holubivka","no",,,,,,
@@ -65481,7 +65481,7 @@
 46487,"URPE","heliport","Kem Helipad",64.96,34.64,82,"EU","RU","RU-KR","Kem","no",,,"ULPE",,,"Вертолётная площадка Кемь, УЛПЕ"
 324922,"URRE","small_airport","Remontnoye Airfield",46.544302,43.6457,409,"EU","RU","RU-ROS","Remontnoye","no",,,"URRE",,,"УРРЕ, Ремонтное"
 46141,"URRH","small_airport","Shakhty Airfield",47.697,40.287,,"EU","RU","RU-ROS","Shakhty","no","URRH",,,,"https://ru.wikipedia.org/wiki/%D0%A8%D0%B0%D1%85%D1%82%D1%8B_(%D0%B0%D1%8D%D1%80%D0%BE%D0%BF%D0%BE%D1%80%D1%82)","Аэропорт Шахты, УРРХ"
-46088,"URRM","small_airport","Morozovsk Air Base",48.313,41.791,400,"EU","RU","RU-ROS","Morozovsk","no","URRM",,,,"https://en.wikipedia.org/wiki/Morozovsk_(air_base)","Аэродром Морозовск, УРРМ"
+46088,"URRM","small_airport","Morozovsk Air Base",48.313,41.791,400,"EU","RU","RU-ROS","Morozovsk","no",,,"XRRM",,"https://en.wikipedia.org/wiki/Morozovsk_(air_base)","Аэродром Морозовск, ЬРРМ, УРРМ"
 507374,"URRN","small_airport","Potapov",47.465981,41.925036,,"EU","RU","RU-ROS",,"no","URRN",,,,,
 326363,"URRP","large_airport","Platov International Airport",47.493888,39.924722,213,"EU","RU","RU-ROS","Rostov-on-Don","yes","URRP","ROV",,,"https://en.wikipedia.org/wiki/Platov_International_Airport","УРРП, Международный аэропорт Платов"
 6518,"URRR","closed","Rostov-on-Don Airport",47.258203,39.8181,280,"EU","RU","RU-ROS","Rostov-on-Don","no",,,,"http://rnd-airport.ru/","https://en.wikipedia.org/wiki/Rostov-on-Don_Airport","ROV, Аэропорт Ростов-на-Дону, Rostov-na-Donu Airport, URRR, RVI"
@@ -73997,6 +73997,11 @@
 531580,"US-8486","heliport","Thompsontown VFD Heliport",40.566328,-77.231097,451,"NA","US","US-PA","Thompsontown","no","PS23",,"PS23",,,
 531725,"US-8487","heliport","Volo Ranch Heliport",33.11614,-95.906205,585,"NA","US","US-TX","Campbell","no","XA00",,"XA00",,,
 531728,"US-8488","heliport","Hunt Regional Medical Center Royse City Heliport",32.979303,-96.282033,560,"NA","US","US-TX","Royse City","no","XS89",,"XS89",,,
+532799,"US-8489","heliport","Kailua-Kona Fire Station Heliport",19.64712,-155.99199,184,"NA","US","US-U-A","Kailua-Kona","no",,,,,,
+532802,"US-8490","heliport","San Bernardino Ranch Border Patrol Heliport",31.37184,-109.20987,3915,"NA","US","US-AZ","Douglas","no",,,,,,
+532805,"US-8491","heliport","Animas Border Patrol Heliport",31.619972,-108.887494,5046,"NA","US","US-NM","Animas","no",,,,,,
+532808,"US-8492","closed","Sabina Airport",39.48875,-83.57728,1023,"NA","US","US-OH","Sabina","no",,,,,,
+532809,"US-8493","small_airport","Bohlander Ranch Airport",43.38761,-105.61395,4905,"NA","US","US-WY","Douglas","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"
@@ -76687,7 +76692,7 @@
 514487,"XK-0007","heliport","Gjilan Regional Hospital Heliport",42.45883,21.46207,1791,"EU","XK","XK-06","Gjilan","no",,,,,,"Heliporti i Spitalit Rajonal të Gjilanit"
 514509,"XK-0008","heliport","KFOR Camp Maxhunaj Heliport",42.78224,21.03111,1837,"EU","XK","XK-02","Maxhunaj","no",,,,,,"Heliporti i bazës së KFOR-it në Maxhunaj"
 35085,"XLLL","medium_airport","Soltsy-2 Air Base",58.139545,30.33042,131,"EU","RU","RU-NGR","Soltsy","no",,,"XLLL",,"https://en.wikipedia.org/wiki/Soltsy-2",
-34934,"XLLN","small_airport","Kasimovo Airfield",60.198299,30.334999,230,"EU","RU","RU-LEN","St. Petersburg","no",,,"XLLN",,"https://en.wikipedia.org/wiki/Kasimovo_Airport","Аэродром Касимово"
+34934,"XLLN","closed","Kasimovo Airfield",60.198299,30.334999,230,"EU","RU","RU-LEN","St. Petersburg","no",,,,,"https://en.wikipedia.org/wiki/Kasimovo_Airport","Аэродром Касимово, XLLN"
 43018,"XLMV","medium_airport","Severomorsk-3 Naval Air Base",68.866669,33.716667,564,"EU","RU","RU-MUR","Severomorsk","no",,,"XLMV","http://severomorsk.3dn.ru/","https://en.wikipedia.org/wiki/Severomorsk-3_(air_base)","Malyavr, Murmansk Northeast"
 319516,"XLO","closed","Long Xuyên Airport",10.330134,105.473144,12,"AS","VN","VN-SW","Long Xuyên","no",,,,,,"XLO, XLO"
 43010,"XLWF","medium_airport","Fedotovo Naval Air Base",59.190372,39.123459,574,"EU","RU","RU-VLG","Kipelovo","no",,,"XLWF","http://www.vologda18.narod.ru/","https://en.wikipedia.org/wiki/Fedotovo_(air_base)","ЬЛВФ, Kipelovo Naval Air Base, Аэродром Федотово, Аэродром Кипелово"
diff --git a/runways.csv b/runways.csv
index def86be51..b3b9062fb 100644
--- a/runways.csv
+++ b/runways.csv
@@ -6244,7 +6244,9 @@
 511852,511851,"53NH",3000,100,"WAT",0,0,"10W",,,,,,"28W",,,,,
 246446,11972,"53NY",1900,80,"TURF",0,0,"05",,,,,,"23",,,,,
 251166,11973,"53OH",3400,100,"TURF",0,0,"09",,,,,,"27",,,,,
-270270,11974,"53OI",50,175,"CONC",0,0,"H1",,,,,,,,,,,
+532811,11974,"53OI",53,53,"Asphalt/Concrete",0,0,"H1",41.460636,-81.698526,781,,,,,,,,
+532812,11974,"53OI",53,53,"Asphalt/Concrete",0,0,"H2",41.460803,-81.698897,781,,,,,,,,
+270270,11974,"53OI",50,175,"CONC",0,1,"HX",41.460633,-81.697631,735,,,,,,,,
 246406,11975,"53OK",3000,100,"TURF",1,0,"17",,,,,,"35",,,,294,
 270271,11976,"53OR",90,90,"CONC",0,0,"H1",,,,,,,,,,,
 270272,11977,"53PA",16,16,"CONC",0,0,"H1",,,,,,,,,,,
@@ -34499,10 +34501,10 @@
 350360,350359,"SDO7",59,59,"CON",1,0,"02",,,,,,"20",,,,,
 351528,351527,"SDO8",66,66,"CON",1,0,"08",,,,,,"28",,,,,
 351530,351529,"SDO9",2297,59,"Earth",0,0,"04",,,,,,"22",,,,,
-269370,46107,"SDOA",2621,59,"TER",0,0,"12",,,,,,"30",,,,,
+269370,46107,"SDOA",2624,59,"Earth",0,0,"12",,,,,,"30",,,,,
 234099,191,"SDOB",4068,75,"ASP",0,0,"13",,,,,,"31",,,,,
 262689,35652,"SDOC",59,59,"CON",0,0,"12",,,,,,"35",,,,,
-269371,46103,"SDOD",2621,59,"TER",0,0,"11",,,,,,"29",,,,,
+269371,46103,"SDOD",2297,59,"Earth",0,0,"11",,,,,,"29",,,,,
 269372,46102,"SDOE",2621,59,"TER",0,0,"9",,,,,,"27",,,,,
 263395,35653,"SDOF",66,66,"CON",0,0,"14",,,,,,,,,,,
 262838,35654,"SDOG",62,62,"CON",0,0,"26",,,,,,"35",,,,,