diff --git a/airports.csv b/airports.csv
index 68f20a6c2..d3598b949 100644
--- a/airports.csv
+++ b/airports.csv
@@ -29987,7 +29987,7 @@
 46310,"IG05","small_airport","Wheeler Airport",41.189763,-86.606956,720,"NA","US","US-IN","Knox","no","IG05",,"IG05",,,
 17882,"IG06","heliport","Wolfelt Heliport",40.48809814453125,-86.85189819335938,560,"NA","US","US-IN","Lafayette","no","IG06",,"IG06",,,
 17883,"IG07","small_airport","Josephs Field",39.05690002441406,-85.03559875488281,860,"NA","US","US-IN","Moores Hill","no","IG07",,"IG07",,,
-42774,"IG22","seaplane_base","Lake Maxinkuckee Seaplane Base",41.20611191,-86.40444183,733,"NA","US","US-IN","Culver","no","01H",,"01H",,,"IG22"
+42774,"IG22","seaplane_base","Lake Maxinkuckee Seaplane Base",41.206112,-86.404442,733,"NA","US","US-IN","Culver","no","K01H",,"01H",,,"IG22"
 17886,"II00","closed","Dammon Heliport",40.506401,-86.862801,664,"NA","US","US-IN","Battle Ground","no",,,,,,"II00"
 17887,"II01","small_airport","Grandlienard-Hogg Airport",40.75619888305664,-85.25050354003906,830,"NA","US","US-IN","Bluffton","no","II01",,"II01",,,
 17888,"II02","small_airport","Kline Field",41.38560104370117,-84.82689666748047,825,"NA","US","US-IN","Butler","no","II02",,"II02",,,
@@ -44369,7 +44369,7 @@
 41990,"MRSI","small_airport","San Isidro del General Airport",9.35262,-83.713097,2100,"NA","CR","CR-SJ","Pérez Zeledón","no","MRSI","IPZ",,,,
 31955,"MRSL","small_airport","Salama Airport",8.789362,-83.271432,32,"NA","CR","CR-P","Salama","no","MRSL",,,,,
 41991,"MRSM","small_airport","Santa Marta Airport",9.916666984558105,-84.61666870117188,417,"NA","CR","CR-A","Orotina","no","MRSM",,,,,
-324217,"MRSN","small_airport","Sirena Airport",8.4776,-83.591343,70,"NA","CR","CR-P","Península de Osa","no","MRSN",,,,,
+324217,"MRSN","small_airport","Sirena Airport",8.4776,-83.591343,70,"NA","CR","CR-P","Península de Osa","no","MRSN",,,,"https://en.wikipedia.org/wiki/Sirena_Aerodrome",
 31956,"MRSO","small_airport","Santa Maria De Guacimo Airport",10.270833,-83.583885,33,"NA","CR","CR-L","Guapiles","no","MRSO",,,,,
 41992,"MRSP","small_airport","San Pedro Airport",10.417900085449219,-83.75299835205078,230,"NA","CR","CR-L","San Pedro","no","MRSP",,,,,
 41993,"MRSQ","small_airport","Sarapigui Airport",10.471518,-83.906788,164,"NA","CR","CR-H","San Carlos","no","MRSQ",,,,,
@@ -44383,7 +44383,7 @@
 41999,"MRTM","small_airport","Tamarindo Airport",10.313500404358,-85.815498352051,41,"NA","CR","CR-G","Tamarindo","no","MRTM","TNO",,,"https://en.wikipedia.org/wiki/Tamarindo_Airport",
 42000,"MRTR","small_airport","Tambor Airport",9.739307,-85.016199,33,"NA","CR","CR-P","Nicoya","no","MRTR","TMU",,,"https://en.wikipedia.org/wiki/Tambor_Airport",
 519430,"MRTS","small_airport","Santa Teresa Airport",9.690254,-85.182878,84,"NA","CR","CR-P","Santa Teresa","no","MRTS",,,,,
-4817,"MRUP","medium_airport","Upala Airport",10.8922,-85.016197,184,"NA","CR","CR-A","Upala","no","MRUP","UPL",,"https://www.facebook.com/AerodromoUpala/","https://en.m.wikipedia.org/wiki/Upala_Airport",
+4817,"MRUP","medium_airport","Upala Airport",10.8922,-85.016197,184,"NA","CR","CR-A","Upala","no","MRUP","UPL",,"https://www.facebook.com/UpalaAeropuerto","https://en.m.wikipedia.org/wiki/Upala_Airport",
 42001,"MRYT","small_airport","Yucatica Airport",10.333333015441895,-83.66666412353516,151,"NA","CR","CR-L","Guacimo","no","MRYT",,,,,
 42002,"MRZP","small_airport","Zapotal De Guanacaste Airport",9.994009971618652,-85.3102035522461,1305,"NA","CR","CR-G","Zapotal","no","MRZP",,,,,
 22306,"MS00","small_airport","Double O Ranch Airport",34.98889923095703,-89.91529846191406,385,"NA","US","US-MS","Olive Branch","no","MS00",,"MS00",,,
@@ -57839,6 +57839,7 @@
 354869,"SJ2F","small_airport","Fazenda Moeda Airport",-21.983333,-57.080833,1122,"SA","BR","BR-MS","Caracol","no","SJ2F",,"MS0624",,,
 506250,"SJ2G","small_airport","Mineração Rosa de Maio Airport",-5.699685,-58.028317,492,"SA","BR","BR-AM","Maués","no","SJ2G",,"AM0109",,,
 430237,"SJ2H","small_airport","Cambaí Airstrip",-28.310556,-55.120278,564,"SA","BR","BR-RS","São Nicolau","no","SJ2H",,"RS0193",,,
+528347,"SJ2I","small_airport","Fazenda Conquista Airstrip",-9.730556,-47.525278,1083,"SA","BR","BR-TO","Rio Sono","no","SJ2I",,"TO0130",,,
 430239,"SJ2J","small_airport","Poleiro Retiro Airport",-17.45293,-56.247309,390,"SA","BR","BR-MS","Corumbá","no","SJ2J",,"MS0651",,,
 430241,"SJ2L","heliport","Santuário Santa Rita de Cássia Heliport",-20.574722,-46.911389,2608,"SA","BR","BR-MG","Cássia","no","SJ2L",,"MG0524",,,
 430243,"SJ2M","small_airport","Fazenda Quatro Irmãos Airstrip",-7.590863,-55.694675,922,"SA","BR","BR-PA","Novo Progresso","no","SJ2M",,"PA0346",,,
@@ -57988,6 +57989,7 @@
 506539,"SJ8K","small_airport","Fazenda Jaraguá Airport",-19.531137,-55.282233,923,"SA","BR","BR-MS","Aquidauana","no","SJ8K",,"MS0616",,,
 506537,"SJ8L","small_airport","Fazenda Morro São Pedro Airstrip",-19.703965,-57.879781,276,"SA","BR","BR-MS","Corumbá","no","SJ8L",,"MS0517",,,
 506535,"SJ8M","heliport","Grupo Conde Heliport",-23.26947,-45.91412,1968,"SA","BR","BR-SP","São José dos Campos","no","SJ8M",,"SP1434",,,
+528352,"SJ8O","small_airport","Fazenda Bela Vista Airport",-12.524876,-61.11823,1076,"SA","BR","BR-RO","Chupinguaia","no","SJ8O",,"RO0096",,,
 506635,"SJ8P","small_airport","Fazenda Mata da Chuva Airport",-11.55925,-57.86479,1007,"SA","BR","BR-MT","Juara","no","SJ8P",,"MT0840",,,
 507884,"SJ8Q","small_airport","Fazenda Brasília",3.213093,-61.094701,430,"SA","BR","BR-RR","Alto Alegre","no","SJ8Q",,"RR0133",,,
 506633,"SJ8R","small_airport","Fazenda Santa Terezinha Airport",-13.538346,-57.824913,1719,"SA","BR","BR-MT","Campo Novo do Parecis","no","SJ8R",,"MT0818",,,
@@ -59837,6 +59839,7 @@
 510305,"SN3L","small_airport","Brasil Agro Airport",-6.786108,-45.734577,1886,"SA","BR","BR-MA","São Raimundo das Mangabeiras","no","SN3L",,"MA0171",,,
 510307,"SN3M","small_airport","Fazenda Pontal Airport",-13.617991,-50.153742,850,"SA","BR","BR-GO","Bonópolis","no","SN3M",,"GO0346",,,
 509787,"SN3N","heliport","Gongo Soco Heliport",-19.967875,-43.589233,3484,"SA","BR","BR-MG","Barão de Cocais","no","SN3N",,"MG0544",,,
+528357,"SN3O","small_airport","De Santana Airport",-13.016028,-44.045892,1811,"SA","BR","BR-BA","Santana","no","SN3O",,"BA0457",,,
 509794,"SN3P","small_airport","Pontal Rosas de Ouro Airport",-12.014726,-57.532211,1194,"SA","BR","BR-MT","Juara","no","SN3P",,"MT0550",,,
 510309,"SN3Q","small_airport","Agrícola Rizzi Airstrip",-4.757222,-45.351944,673,"SA","BR","BR-MA","Lago da Pedra","no","SN3Q",,"MA0169",,,
 510665,"SN3R","small_airport","Lagoa da Serra Airstrip",-3.205144,-52.431883,577,"SA","BR","BR-PA","Altamira","no","SN3R",,"PA0342",,,
@@ -60990,7 +60993,7 @@
 44725,"SSCU","small_airport","Fazenda Santa Marina Airport",-8.86894,-50.481324,1007,"SA","BR","BR-PA","Santa Maria Das Barreiras","no","SSCU",,"PA0123",,,
 37426,"SSCW","small_airport","Fazenda Santa Glória Airport",-18.039722,-56.005554,456,"SA","BR","BR-MS","Corumbá","no","SIQO",,"MS0121",,,"SSCW, Fazenda São Sebastião"
 37427,"SSCX","small_airport","Fazenda Coxilha Airport",-28.095087,-52.335746,2133,"SA","BR","BR-RS","Passo Fundo","no","SSCX",,"RS0093",,,
-37428,"SSCY","heliport","Sikorski Heliport",-25.439011,-49.448404,3149,"SA","BR","BR-PR","Campo Largo","yes","SSCY",,,"http://www.sikorski.com.br",,"pilotoprivado, piloto, pilotodehelicóptero, cursopiloto, pilotocomercial, pilotosdehelicóptero, pilotobrasil, cursodepilotagem, escoladepilotagem, escoladepilotos, escoladeaviacao, escoladeaviação, heliponto, heliporto, helicentro, r44, r22, robinson, roto"
+37428,"SSCY","heliport","Sikorski Heliport",-25.438472,-49.448541,3149,"SA","BR","BR-PR","Campo Largo","yes","SSCY",,"PR0132","http://www.sikorski.com.br",,"pilotoprivado, piloto, pilotodehelicóptero, cursopiloto, pilotocomercial, pilotosdehelicóptero, pilotobrasil, cursodepilotagem, escoladepilotagem, escoladepilotos, escoladeaviacao, escoladeaviação, heliponto, heliporto, helicentro, r44, r22, robinson, roto"
 37429,"SSCZ","closed","Tenoar Airport",-18.811943,-52.639168,2664,"SA","BR","BR-MS","Chapadão Do Sul","no",,,,,,"SSCZ"
 333186,"SSDA","heliport","Água Mansa Heliport",-23.741404,-45.404187,7,"SA","BR","BR-SP","São Sebastião","no","SSDA",,"SP0746",,,
 37430,"SSDB","closed","Fazenda Kurupay Airport",-22.036142,-53.735837,1280,"SA","BR","BR-MS","Angélica","no",,,,,,"SSDB, SWFK, MS0374"
@@ -61000,21 +61003,21 @@
 37433,"SSDF","small_airport","Fazenda São José Airport",-20.099443435669,-57.346111297607,312,"SA","BR","BR-MS","Corumbá","no",,,,,,"SSDF"
 44726,"SSDG","small_airport","Fazenda Nazaré Airport",-9.335862,-45.57298,2034,"SA","BR","BR-PI","Santa Filomena","no","SNXZ",,"PI0033",,,"SSDG"
 37434,"SSDH","closed","Fazenda Caranday Airport",-20.205557,-57.063332,541,"SA","BR","BR-MS","Corumbá","no",,,,,,"SSDH"
-44727,"SSDI","small_airport","Fazenda Bacatuba Airport",-5.6583328247099995,-43.705554962200004,584,"SA","BR","BR-MA","Buriti Bravo","no","SSDI",,,,,
+44727,"SSDI","small_airport","Fazenda Bacatuba Airport",-5.659765,-43.705702,584,"SA","BR","BR-MA","Buriti Bravo","no","SSDI",,"MA0044",,,
 37435,"SSDJ","small_airport","Fazenda Bonanza Airport",-19.050832748413,-54.064998626709,1252,"SA","BR","BR-MS","Camapuã","no",,,,,,"SSDJ"
 37436,"SSDK","small_airport","São Pedro",-20.075955,-44.727917,2713,"SA","BR","BR-MG",,"no","SSDK",,"MG0178",,,
-44728,"SSDL","small_airport","Fazenda Ribeirão Airport",-8.00638866425,-45.338054657,1588,"SA","BR","BR-PI","Ribeirão Gonçalves","no","SSDL",,,,,
+44728,"SSDL","small_airport","Fazenda Ribeirão Airport",-8.008883,-45.333596,1588,"SA","BR","BR-PI","Ribeirão Gonçalves","no","SSDL",,"PI0034",,,
 37437,"SSDM","small_airport","Aeroclube de Santana do Livramento Airport",-30.822222,-55.576389,1073,"SA","BR","BR-RS","Santana do Livramento","no",,,,,,"SSDM"
 44729,"SSDN","small_airport","Fazenda Galiléia Airport",-9.1044,-45.4166679382,1932,"SA","BR","BR-PI","Baixa Grande Do Ribeiro","no",,,,,,"SSDN"
 447,"SSDO","small_airport","Dourados Airport",-22.2019,-54.926601,1503,"SA","BR","BR-MS","Dourados","yes","SBDO","DOU","MS0008",,"https://en.wikipedia.org/wiki/Dourados_Airport","SSDO"
-44730,"SSDP","small_airport","Fazenda Fortaleza do Guaporé Airport",-14.459444046,-60.1780548096,738,"SA","BR","BR-MT","Vila Bela Da Santíssima Trindade","no","SSDP",,,,,
-37438,"SSDQ","small_airport","Fazenda Marema Airport",-20.182777404785156,-56.635833740234375,446,"SA","BR","BR-MS","Miranda","no","SSDQ",,,,,
+44730,"SSDP","small_airport","Fazenda Fortaleza do Guaporé Airport",-14.463956,-60.174884,778,"SA","BR","BR-MT","Vila Bela da Santíssima Trindade","no","SSDP",,"MT0284",,,
+37438,"SSDQ","small_airport","Fazenda Marema Airport",-20.180732,-56.634712,463,"SA","BR","BR-MS","Miranda","no","SSDQ",,"MS0259",,,
 46185,"SSDR","heliport","Eletrocity Heliport",-20.207646,-40.234916,75,"SA","BR","BR-ES","Serra","yes",,,,,,"SSDR"
 44731,"SSDS","small_airport","Fazenda Bandeirantes Airport",-13.7072219849,-50.6477775574,935,"SA","BR","BR-GO","Nova Crixás","no",,,,,,"SSDS"
-44732,"SSDT","small_airport","Fazenda Pau D`Arco Airport",-7.943611145019999,-50.176387786899994,794,"SA","BR","BR-PA","Redenção","no","SSDT",,,,,
+44732,"SSDT","small_airport","Fazenda Pau d'Arco Airport",-7.941807,-50.180906,794,"SA","BR","BR-PA","Redenção","no","SSDT",,"PA0124",,,
 37439,"SSDU","small_airport","Fazenda Modelo Airport",-17.990748,-54.225684,1309,"SA","BR","BR-MS","Pedro Gomes","no",,,,,,"SSDU"
-37440,"SSDV","small_airport","Fazenda Santa Maria Airport",-18.216110229492188,-55.46527862548828,508,"SA","BR","BR-MS","Coxim","no","SSDV",,,,,
-44733,"SSDW","small_airport","Fazenda Potrich Airport",-12.924444198600002,-55.519168853800004,1197,"SA","BR","BR-MT","Sorriso","no","SSDW",,,,,
+37440,"SSDV","small_airport","Fazenda Santa Maria Airport",-18.209771,-55.465482,518,"SA","BR","BR-MS","Corumbá","no","SSDV",,"MS0260",,,
+44733,"SSDW","small_airport","Fazenda Potrich Airport",-12.915799,-55.535563,1335,"SA","BR","BR-MT","Sorriso","no","SSDW",,"MT0287",,,
 37441,"SSDX","small_airport","Fazenda da Coxilha Airport",-31,-51.700557708740234,33,"SA","BR","BR-RS","Camaquã","no","SSDX",,,,,
 46118,"SSDY","small_airport","Fazenda Duas Irmãs Airport",-16.15666667,-53.00972222,1410,"SA","BR","BR-MT","Guiratinga","no",,,"SSDY",,,"SSDY"
 37442,"SSDZ","closed","Fazenda Divisão Airport",-23.133888,-54.633888,1312,"SA","BR","BR-MS","Amambaí","no",,,,,,"SSDZ"
@@ -63673,7 +63676,7 @@
 518331,"TT87","small_airport","Agua Nada Ranch Airport",29.798653,-100.287872,2053,"NA","US","US-TX","Rocksprings","no","TT87",,"TT87",,,
 430464,"TT98","small_airport","Kelly Air Field",33.658808,-96.467672,630,"NA","US","US-TX","Bells","no","TT98",,"TT98",,,
 338975,"TT99","small_airport","Leinart Farms Airstrip",33.19204,-96.21986,624,"NA","US","US-TX","Merit","no","TT99",,"TT99",,,
-6409,"TTCP","medium_airport","A.N.R. Robinson International Airport",11.1497,-60.832199,38,"NA","TT","TT-TOB","Scarborough","yes","TTCP","TAB",,"https://tntairports.com/anr-robinson-international-airport/#","https://en.wikipedia.org/wiki/Crown_Point_Airport","Tobago-Crown Point Airport"
+6409,"TTCP","medium_airport","A.N.R. Robinson International Airport",11.1497,-60.832199,38,"NA","TT","TT-TOB","Scarborough","yes","TTCP","TAB",,"https://tntairports.com/anr-robinson-international-airport/#","https://en.wikipedia.org/wiki/A.N.R._Robinson_International_Airport","Tobago-Crown Point Airport"
 6410,"TTPP","medium_airport","Piarco International Airport",10.5954,-61.3372,58,"NA","TT","TT-TUP","Port of Spain","yes","TTPP","POS",,"https://tntairports.com/piarco-international-airport/","https://en.wikipedia.org/wiki/Piarco_International_Airport",
 309422,"TTW","seaplane_base","Tissa Tank Waterdrome",6.2876,81.2906,75,"AS","LK","LK-3","Tissamaharama","yes",,"TTW",,,,
 315016,"TUE","closed","Tupile Airport",9.45,-78.566667,5,"NA","PA","PS-GY","Isla Tupile","no",,,,,,"TUE"
diff --git a/runways.csv b/runways.csv
index dd289370f..a6cac3950 100644
--- a/runways.csv
+++ b/runways.csv
@@ -28818,7 +28818,7 @@
 235373,4816,"MRSV",3215,36,"ASP",0,0,"08",8.82544994354248,-82.96330261230469,,81.4,,"26",8.826769828796387,-82.95449829101562,,261.4,
 259688,41999,"MRTM",2625,,"UNK",0,0,"07",,,43,,,"25",,,43,,
 327717,42000,"MRTR",2723,,"ASP",0,0,"12",,,,,,"30",,,,,
-235387,4817,"MRUP",3536,59,"ASP",0,0,"04",10.8889,-85.019402,184,44,,"22",10.8955,-85.012901,158,224,
+235387,4817,"MRUP",3536,59,"ASP",0,0,"05",10.8889,-85.019402,184,44,,"23",10.8955,-85.012901,158,224,
 255467,22306,"MS00",2200,75,"TURF",0,0,"09",,,,,,"27",,,,,
 268123,22307,"MS01",40,40,"CONC",0,0,"H1",,,,,,,,,,,
 268124,22308,"MS02",40,40,"CONC",0,0,"H1",,,,,,,,,,,
@@ -36944,6 +36944,7 @@
 510304,510303,"SN3K",66,66,"CON",0,0,"23",,,,,,,,,,,
 510306,510305,"SN3L",2953,59,"Earth",0,0,"11",,,,,,"29",,,,,
 510308,510307,"SN3M",3806,75,"Earth",0,0,"12",,,,,,"30",,,,,
+528358,528357,"SN3O",3945,98,"ASP",0,0,"12",,,,,,"30",,,,,
 509797,509794,"SN3P",2953,59,"Earth",0,0,"07",,,,,,"25",,,,,
 510310,510309,"SN3Q",3937,59,"Piçarra",0,0,"08",,,,,,"26",,,,,
 510666,510665,"SN3R",2346,59,"GVL",0,0,"10",,,,,,"28",,,,,
@@ -37836,18 +37837,18 @@
 261837,44727,"SSDI",2953,59,"ASP",0,0,"16",,,,,,"34",,,,,
 260610,37435,"SSDJ",1870,66,"GRS",0,0,"6",,,,,,"24",,,,,
 261146,37436,"SSDK",4200,75,"concrete",0,0,"11",,,,,,"29",,,,,
-261868,44728,"SSDL",3281,69,"ASP",0,0,"14",,,,,,"32",,,,,
+261868,44728,"SSDL",3281,69,"Piçarra",0,0,"14",,,,,,"32",,,,,
 260697,37437,"SSDM",2133,66,"GRS",0,0,"9",,,,,,"27",,,,,
 262248,44729,"SSDN",2953,59,"GRE",0,0,"12",,,,,,"30",,,,,
 234290,447,"SSDO",6398,98,"ASP",1,0,"06",-22.208689,-54.93272,1494,,,"24",-22.19504,-54.920765,1494,,
-261135,44730,"SSDP",3937,66,"GRS",0,0,"16",,,,,,"34",,,,,
-260723,37438,"SSDQ",2297,66,"GRS",0,0,"4",,,,,,"22",,,,,
+261135,44730,"SSDP",3937,66,"ASP",0,0,"16",,,,,,"34",,,,,
+260723,37438,"SSDQ",2297,66,"GRS",0,0,"05",,,,,,"23",,,,,
 269361,46185,"SSDR",59,59,"CONC",0,0,"12",,,,,,"22",,,,,
 262484,44731,"SSDS",3937,66,"GRE",0,0,"18",,,,,,"36",,,,,
 261471,44732,"SSDT",3281,66,"ASP",0,0,"13",,,,,,"31",,,,,
 260979,37439,"SSDU",3150,197,"GRS",0,0,"4",,,,,,"22",,,,,
-261063,37440,"SSDV",3281,115,"GRS",0,0,"18",,,,,,"36",,,,,
-261748,44733,"SSDW",4921,59,"ASP",0,0,"18",,,,,,"36",,,,,
+261063,37440,"SSDV",3609,66,"GRS",0,0,"01",,,,,,"19",,,,,
+261748,44733,"SSDW",3609,59,"GVL",0,0,"17",,,,,,"35",,,,,
 262024,37441,"SSDX",1969,59,"GRE",0,0,"17",,,,,,"35",,,,,
 269326,46118,"SSDY",3117,59,"GRAVEL",0,0,"9",,,,,,"27",,,,,
 262170,37442,"SSDZ",2625,98,"GRE",0,0,"17",,,,,,"35",,,,,