diff --git a/airport-comments.csv b/airport-comments.csv
index fbccbdd91..ac4cfb505 100644
--- a/airport-comments.csv
+++ b/airport-comments.csv
@@ -1,4 +1,59 @@
 "id", "threadRef", "airportRef", "airportIdent", "date", "memberNickname", "subject", "body"
+526374,82326,1766,"CYHR","2024-04-22 00:09:16","berk","Updated runway id","NavCanada charts lists the runways as 07/25. Also updated headings: 076 and 256 in accordance with NavCanada charts.
+
+-- www.maverickapp.com team."
+526373,82325,1752,"CYGW","2024-04-22 00:05:33","berk","Updated runway ids","NavCanada charts lists the runway numbers as 03/21. Updated to match it."
+526371,82324,1653,"CYAD","2024-04-21 23:59:46","berk","Updated runway ids","Updated runway ids to 10/28 to match data from NavCanada charts.
+
+-- www.maverickapp.com team."
+526370,82323,1618,"CTU2","2024-04-21 23:57:53","berk","Updated runway ids to match NavCanada data.","Runway ids updated to 09/27 to match NavCanada data."
+526369,82322,1514,"CSF3","2024-04-21 23:56:49","berk","Runway id update","Updated runway ids to match NavCanada data
+
+-- www.maverickapp.com team."
+526368,82321,1997,"CYZR","2024-04-21 23:53:58","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 5/23 and 14/32 to 6/24 and 15/33 to match with NavCanada data."
+526350,82320,1304,"CNF4","2024-04-21 21:38:34","berk","Updated runway ids to match NavCanada data.","Updated runway id from 02/20 to 03/21 to match NavCanada data.
+
+-- www.maverickapp.com team."
+526349,82319,2046,"CZWL","2024-04-21 21:36:31","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 16/34 to 17/35 to match the data from NavCanada.
+
+-- www.maverickapp.com"
+526348,82318,2045,"CZWH","2024-04-21 21:32:43","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 02/20 to 03/21 to match data from NavCanada.
+
+-- www.maverickapp.com team."
+526347,82317,2034,"CZPC","2024-04-21 21:31:36","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 07/25 to 08/26 to match the data from NavCanada.
+
+-- www.maverickapp.com team."
+526346,82316,2031,"CZNG","2024-04-21 21:27:58","berk","Updated runway ids to match NavCanada data.","Updated runway ids 09/27 to 10/28 to match data from NavCanada.
+
+-- www.maverickapp.com team."
+526345,82315,2026,"CZLQ","2024-04-21 21:26:41","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 11/29 to 12/30 to match data from NavCanada.
+
+-- www.maverickapp.com team."
+526344,82314,2023,"CZJG","2024-04-21 21:25:31","berk","Updated runway ids to match NavCanada data.","Updated runway ids from 14 & 32 to 15 & 33 to match NavCanada data.
+
+-- www.maverickapp.com team."
+526343,82313,2012,"CZEE","2024-04-21 21:24:14","berk","Updated runway idents in accordance with NavCanada data","Updated runways 11 & 29 to 12 & 30 to match NavCanada data.
+
+-- www.maverickapp.com team."
+526342,82312,1953,"CYWV","2024-04-21 21:23:04","berk","Updated runway ids updated to match NavCanada data.","Runway ids updated to match NavCanada data: 13 & 31.
+
+-- www.maverickapp.com team."
+526341,82311,1951,"CYWM","2024-04-21 21:19:50","berk","Updated runway ids to match NavCanada data","NavCanada runway ids are: 17 & 35. Updated to match.
+
+-- www.maverickapp.com team."
+526340,82310,1933,"CYVC","2024-04-21 21:16:52","berk","Updated runway ids to match NavCanada data.","Updated runways 10 & 28 to 11 & 29 to match NavCanada data.
+
+-- www.maverickapp.com team."
+526339,82309,1920,"CYTH","2024-04-21 21:15:08","berk","Updated runway idents in accordance with NavCanada","NavCanada data mentions 6 & 24 and 15 & 33. Updated to match Nav Canada data.
+
+-- www.maverickapp.com team."
+526338,82308,1894,"CYRS","2024-04-21 21:13:12","berk","Updated runway ids","Current runway ids were 8 & 26. Per Nav Canada, the ids are: 9 & 27. Updated to conform with Nav Canada data.
+
+-- www.maverickapp.com team"
+526337,82307,1828,"CYNL","2024-04-21 21:04:56","berk","Updated runways","Updated runways to match with Nav Canada published runway numbers.
+
+- www.maverickapp.com team."
+526326,4919,15494,"96M","2024-04-21 17:54:51","Bill35","re: Seaplane base","The seaplane base symbol is located on the water runway!"
 526162,2545,3647,"KLNK","2024-04-19 16:54:57","paradigmcmi","re: Almost a movie star!","Reply to @32Aret: According to the Wikipedia page for the film, the ""Lincoln Airport"" they referenced was a fictional airport in based in Chicago, not Lincoln, Nebraska."
 525656,82306,319205,"TD-0006","2024-04-14 18:35:43","LuxGuy","(no subject)","Flew into Koumra in a Shorts SC7, Reg LX-UGO on Oct 2 1990. Just a quick stop just to check out the airport before continuing to Moundou, FTTD for some cold GALA. This was in conjonction with the locust control. I remember very well following the dirt road branching off the main road and  leading to the threshold of 04."
 525590,82305,6217,"SPIM","2024-04-13 16:48:07","berk","Incorrect ident","The ident for this airport should be SPJC, not SPIM. Unfortunately the ident can not be edited by my own, hence leaving this comment here hoping someone with the edit privileges follows-up."
diff --git a/airports.csv b/airports.csv
index c3cc949c6..3c20168af 100644
--- a/airports.csv
+++ b/airports.csv
@@ -3097,6 +3097,7 @@
 9264,"29NE","small_airport","Bartmess Airport",40.76110076904297,-101.18099975585938,3150,"NA","US","US-NE","Wallace","no","29NE",,"29NE",,,
 9265,"29NH","heliport","Sunny Hill Landing Heliport",42.88840103149414,-71.73780059814453,822,"NA","US","US-NH","Lyndeborough","no","29NH",,"29NH",,,
 9266,"29NJ","heliport","J L Gentile Heliport",39.483979848,-74.8808383942,110,"NA","US","US-NJ","Buena","no","29NJ",,"29NJ",,,"H-22"
+526305,"29NK","heliport","UHS Wilson Tower Helipad",42.115033,-75.958461,985,"NA","US","US-NY","Johnson City","no","29NK",,"29NK",,,
 45550,"29NY","closed","Breezy Meadows Heliport",44.088,-76.269167,296,"NA","US","US-NY","Cape Vincent","no",,,,,,"29NY"
 9267,"29OH","small_airport","Fox Airport",40.6864013671875,-81.30259704589844,1020,"NA","US","US-OH","Magnolia","no","29OH",,"29OH",,,
 9268,"29OI","heliport","Jtv Heliport",41.81700134277344,-81.06900024414062,630,"NA","US","US-OH","Madison","no","29OI",,"29OI",,,
@@ -6104,6 +6105,7 @@
 11863,"51CA","small_airport","Kelly Airport",34.42359924316406,-116.61699676513672,2806,"NA","US","US-CA","Lucerne Valley","no","51CA",,"51CA",,,
 11864,"51CL","small_airport","Vetters Sky Ranch Airport",38.230499267578125,-121.22200012207031,80,"NA","US","US-CA","Galt","no","51CL",,"51CL",,,
 11865,"51CO","small_airport","Flying W No.2 Airport",38.885601043701,-107.80400085449,7105,"NA","US","US-CO","Hotchkiss","no",,,"51CO",,,"51CO"
+526308,"51FA","heliport","UF Health North Heliport",30.483961,-81.631897,34,"NA","US","US-FL","Jacksonville","no","51FA",,"51FA",,,
 11866,"51FD","small_airport","Tex Merritt Private Airstrip",28.667800903320312,-81.91809844970703,95,"NA","US","US-FL","Leesburg","no","51FD",,"51FD",,,
 11867,"51FL","small_airport","Chiefland Sky Ranch Airport",29.39489937,-82.86979675,35,"NA","US","US-FL","Chiefland","no","51FL",,"51FL",,,
 11868,"51G","small_airport","Alkay Airport",43.143588,-83.796938,722,"NA","US","US-MI","Clio","no",,,"51G",,,"Cagney"
@@ -8851,6 +8853,7 @@
 346028,"7MS4","small_airport","Cloud 9 Airport",32.602777,-90.192781,250,"NA","US","US-MS","Canton","no","7MS4",,"7MS4",,,
 345691,"7MS7","small_airport","Freebird Airport",32.37409,-90.437061,242,"NA","US","US-MS","Bolton","no","7MS7",,"7MS7",,,
 347886,"7MT5","heliport","Kyle Heliport",46.080271,-114.178644,3860,"NA","US","US-MT","Darby","no","7MT5",,"7MT5",,,
+526320,"7MY6","heliport","Astera Health Heliport",46.451283,-95.156417,1349,"NA","US","US-MN","Wadena","no","7MY6",,"7MY6",,,
 45966,"7MY9","small_airport","Petes Airport",43.746717,-92.7245,1337,"NA","US","US-MN","Dexter","no","7MY9",,"7MY9",,,
 14256,"7N0","heliport","New Orleans Downtown Heliport",29.952649,-90.08256,30,"NA","US","US-LA","New Orleans","no","K7N0",,"7N0",,,"Superdome"
 14257,"7N2","closed","Peekskill Seaplane Base",41.245899,-73.962097,,"NA","US","US-NY","Peekskill","no",,,,,,"7N2"
@@ -10281,6 +10284,7 @@
 15476,"95XS","closed","Air Logistics Sabine Heliport",29.713849,-93.913329,7,"NA","US","US-TX","Sabine Pass","no",,,,,,"95XS, 95XS, 95XS"
 15477,"95Z","small_airport","Bradley Sky-Ranch Airport",64.758904,-147.392235,483,"NA","US","US-AK","North Pole","no","K95Z",,"95Z",,,
 15478,"96AK","seaplane_base","Hackney Landing Seaplane Base",60.28779983520508,-151.3459930419922,208,"NA","US","US-AK","Clam Gulch","no","96AK",,"96AK",,,
+526322,"96AL","small_airport","Bent Oak Airport",30.827684,-87.889177,87,"NA","US","US-AL","Bay Minette","no","96AL",,"96AL",,,
 15479,"96C","small_airport","Fox River Airport",42.75,-88.25090026855469,822,"NA","US","US-WI","Rochester","no","96C",,"96C",,,
 15480,"96CA","heliport","Warner Center Plaza I Helipad",34.178276,-118.60032,1133,"NA","US","US-CA","Woodland Hills","no","96CA",,"96CA",,,"JWC"
 15481,"96CL","heliport","Ranch Heliport",34.157704,-118.917802,1162,"NA","US","US-CA","Newbury Park","no","96CL",,"96CL",,,"TWI II Heliport"
@@ -10297,7 +10301,7 @@
 15491,"96KY","small_airport","Woosley Field Airport",37.552652,-87.272544,465,"NA","US","US-KY","Calhoun","no","96KY",,"96KY",,,"KY96, A&L, A and L"
 15492,"96LA","heliport","Louisiana State Police Troop A Heliport",30.347384,-91.031395,18,"NA","US","US-LA","Baton Rouge","no","96LA",,"96LA",,,
 15493,"96LL","closed","Wichman Airport",40.6161,-87.614197,681,"NA","US","US-IL","Stockland","no",,,,,,"96LL"
-15494,"96M","seaplane_base","Moberg Air Base",47.499698638916016,-94.94529724121094,1370,"NA","US","US-MN","Bemidji","no","96M",,"96M",,,
+15494,"96M","seaplane_base","Moberg Air Base Seaplane Base",47.498265,-94.947405,1370,"NA","US","US-MN","Bemidji","no","MY63",,"MY63",,,"96M"
 324841,"96MI","heliport","Dick Huvaere's Heliport",45.395581,-84.874333,675,"NA","US","US-MI","Petoskey","no","96MI",,"96MI",,,
 15495,"96MN","closed","Air-Ag Airport",43.568001,-93.254402,1240,"NA","US","US-MN","Glenville","no",,,,,,"96MN"
 15496,"96MO","heliport","Riverlands Area Heliport",38.86309814453125,-90.15709686279297,434,"NA","US","US-MO","West Alton","no","96MO",,"96MO",,,
@@ -10408,6 +10412,7 @@
 15585,"98OR","small_airport","Mach-O Acres Airport",45.19900131225586,-123.37000274658203,435,"NA","US","US-OR","Sheridan","no","98OR",,"98OR",,,
 15586,"98PA","closed","Pleasant Hill Airport",40.88166,-80.18599,1180,"NA","US","US-PA","Portersville","no",,,,,,"98PA"
 15587,"98PN","heliport","Lehigh Valley Hospital Cedar Crest Heliport",40.56561,-75.523356,400,"NA","US","US-PA","Allentown","no","98PN",,"98PN",,,"Trauma Center"
+526324,"98SC","small_airport","Cowtown Airport",33.227837,-81.176936,250,"NA","US","US-SC","Govan","no","98SC",,"98SC",,,
 15588,"98TA","heliport","Medical City Weatherford Heliport",32.747722,-97.786487,1050,"NA","US","US-TX","Weatherford","no","98TA",,"98TA",,,"Weatherford Regional Medical Center Heliport"
 15589,"98TE","small_airport","Hilltop Airport",43.32210159301758,-123.177001953125,1320,"NA","US","US-OR","Glide","no","98TE",,"98TE",,,
 45798,"98TN","small_airport","Landing At River'S Edge",36.1425,-83.604167,1019,"NA","US","US-TN","Blaine","no","98TN",,"98TN",,,
@@ -15963,6 +15968,7 @@
 526138,"BR-1885","heliport","Fazenda Santo Antônio Heliport.",-22.46468,-46.912605,2205,"SA","BR","BR-SP","Moji-Mirim","no","SWPJ",,"SP0850",,,
 526159,"BR-1886","small_airport","CEA-Caçapava Airport",-23.126104,-45.6643,2198,"SA","BR","BR-SP","Caçapava","no","SWPW",,"SP0280","http://www.aerovale-cea.com.br/",,"Aerovale"
 526166,"BR-1887","small_airport","Aldeia Kubenkrankenh Airstrip",-8.141166,-52.122089,1145,"SA","BR","BR-PA","Ourilândia do Norte","no","SWQK",,"PA0148",,,
+526329,"BR-1888","small_airport","Fazenda Santa Vitória-MT Airport",-11.420057,-55.816018,869,"SA","BR","BR-MT","Tabaporã","no","SIPV",,"MT0566",,,
 30637,"BR-ALT","small_airport","Alenquer Municipal Airport",-1.917,-54.7231,55,"SA","BR","BR-PA","Alenquer","no","SDWQ","ALT","PA0027",,"https://en.wikipedia.org/wiki/Alenquer_Airport",
 32402,"BR-SWM","closed","Suia-Missu Airport",-11.671699523925781,-51.43470001220703,,"SA","BR","BR-MT","Alto Boa Vista","no",,,,,,"SWM, SWM"
 312520,"BRG","closed","Whitesburg Municipal Airport",37.2219,-82.8742,1985,"NA","US","US-KY","Whitesburg","no",,,,,,"BRG, Isom Airport, Letcher County"
@@ -19094,7 +19100,7 @@
 16821,"CN01","heliport","Mendocino Coast District Hospital Heliport",39.431876,-123.799621,108,"NA","US","US-CA","Fort Bragg","no","CN01",,"CN01",,,
 45313,"CN02","heliport","San Francisco VA Medical Center Heliport",37.783331,-122.506389,350,"NA","US","US-CA","San Francisco","no","CN02",,"CN02",,,
 45308,"CN06","heliport","Sonoma Raceway Heliport Pad 2",38.155081,-122.450692,110,"NA","US","US-CA","Sonoma","no","CN06",,"CN06",,,
-16822,"CN10","heliport","Mono County Medical Heliport",38.252336,-119.230199,6450,"NA","US","US-CA","Bridgeport","no","CN10",,"CN10",,,
+16822,"CN10","closed","Mono County Medical Heliport",38.252336,-119.230199,6450,"NA","US","US-CA","Bridgeport","no",,,,,,"CN10"
 16823,"CN11","heliport","Uc Davis Medical Center Life Flight Base Heliport",38.55110168457031,-121.45099639892578,32,"NA","US","US-CA","Sacramento","no","CN11",,"CN11",,,
 16824,"CN12","small_airport","Williams Gliderport",39.16350173950195,-122.13200378417969,68,"NA","US","US-CA","Williams","no","CN12",,"CN12",,,
 16825,"CN13","small_airport","Borges - Clarksburg Airport",38.443199,-121.509003,16,"NA","US","US-CA","Clarksburg","no","CN13",,"CN13",,,
@@ -19866,7 +19872,7 @@
 16985,"CT28","heliport","Veterans Home & Hospital Heliport",41.65840148925781,-72.64759826660156,150,"NA","US","US-CT","Rocky Hill","no","CT28",,"CT28",,,
 16986,"CT29","small_airport","Valley Farm Airport",42.013271,-72.472519,221,"NA","US","US-CT","Somers","no","CT29",,"CT29",,,
 16987,"CT30","closed","Nayaug Seaplane Landing Area Seaplane Base",41.639,-72.628098,3,"NA","US","US-CT","South Glastonbury","no",,,,,,"CT30"
-16988,"CT31","small_airport","Swift Airport",41.9650993347168,-72.33290100097656,515,"NA","US","US-CT","Stafford Springs","no","CT31",,"CT31",,,
+16988,"CT31","closed","Swift Airport",41.965099,-72.332901,515,"NA","US","US-CT","Stafford Springs","no",,,,,,"CT31"
 16989,"CT32","small_airport","Gallup Farm Airport",41.535400390625,-71.83450317382812,440,"NA","US","US-CT","Voluntown","no","CT32",,"CT32",,,
 16990,"CT33","heliport","Clark Heliport",41.48149871826172,-72.80590057373047,127,"NA","US","US-CT","Wallingford","no","CT33",,"CT33",,,
 16991,"CT34","heliport","Ussc/North Haven Heliport",41.338401794433594,-72.86820220947266,12,"NA","US","US-CT","North Haven","no","CT34",,"CT34",,,
@@ -23437,7 +23443,12 @@
 515200,"EHDV","heliport","D15-FA-1 Heliport",54.32472,2.93417,,"EU","NL","NL-XX",,"no","EHDV",,,,,
 515201,"EHDY","heliport","D18-A Heliport",54.14917,2.82194,,"EU","NL","NL-XX",,"no","EHDY",,,,,
 2518,"EHEH","large_airport","Eindhoven Airport",51.4500999451,5.37452983856,74,"EU","NL","NL-NB","Eindhoven","yes","EHEH","EIN",,"http://www.eindhovenairport.nl/","https://en.wikipedia.org/wiki/Eindhoven_Airport","Welschap Airport"
+526392,"EHFO","heliport","F15-A",54.21583,4.82722,,"EU","NL","NL-XX",,"no","EHFO",,,,,
+526400,"EHFT","heliport","L5-D",53.81806,4.51278,,"EU","NL","NL-XX",,"no","EHFT",,,,,
 2519,"EHGG","medium_airport","Groningen Airport Eelde",53.119701,6.57944,17,"EU","NL","NL-DR","Groningen","yes","EHGG","GRQ",,,"https://en.wikipedia.org/wiki/Groningen_Airport_Eelde",
+526398,"EHGN","heliport","G14-A",54.22389,5.49861,,"EU","NL","NL-XX",,"no","EHGN",,,,,
+526395,"EHGO","heliport","G14-B",54.21583,5.43472,,"EU","NL","NL-XX",,"no","EHGO",,,,,
+526397,"EHGQ","heliport","G17D-A",54.04917,5.43194,,"EU","NL","NL-XX",,"no","EHGQ",,,,,
 2520,"EHGR","medium_airport","Gilze Rijen Air Base",51.567402,4.93183,49,"EU","NL","NL-NB","Rijen","no","EHGR","GLZ",,"http://www.defensie.nl/luchtmacht/luchtmachtbases/gilze-rijen/","https://en.wikipedia.org/wiki/Gilze-Rijen_Air_Base",
 43207,"EHHA","heliport","Amsterdam Heliport",52.414625,4.804802,1,"EU","NL","NL-NH","Amsterdam","no","EHHA",,,"http://www.amsterdamheliport.com/","https://en.wikipedia.org/wiki/Amsterdam_Heliport",
 332213,"EHHE","heliport","Eemshaven Heliport",53.460833,6.814329,,"EU","NL","NL-GR","Eemshaven","no","EHHE",,,,"https://nl.wikipedia.org/wiki/Heliport_Eemshaven","Het Hogeland"
@@ -24078,7 +24089,7 @@
 320777,"ES-0105","small_airport","Aeródromo de Lumbier",42.66565,-1.302383,1575,"EU","ES","ES-NC","Lumbier","no","LEUM",,,"http://www.pyrineum.com",,"Vuelo Lumbier,Gyro Club Pamplona"
 320787,"ES-0106","small_airport","Olula del Río",37.362538,-2.331969,1860,"EU","ES","ES-AN","Olula del Río","no",,,,,,
 320788,"ES-0107","small_airport","Las Torres de Aliste",41.68315,-6.30767,2749,"EU","ES","ES-CL",,"no",,,,,,
-320824,"ES-0108","small_airport","Campo de Vuelo Casimiro Patiño",38.705783,-6.9997499994,820,"EU","ES","ES-EX","Valverde de Leganés","no",,,,,,
+320824,"ES-0108","small_airport","Campo de Vuelo Casimiro Patiño",38.705783,-6.99975,820,"AF","ES","ES-EX","Valverde de Leganés","no","LEPN",,,,,
 320825,"ES-0109","medium_airport","Folgueroles Airfield",41.9527,2.3072,1670,"EU","ES","ES-CT","Folgueroles","no",,,,,,"Osona"
 321029,"ES-0110","small_airport","Aeródromo de Córdoba-Villarrubia",37.8367253,-4.8964369,,"EU","ES","ES-AN","Villarrubia","no",,,,,,
 321030,"ES-0111","small_airport","Aeródromo Villanueva del Pardillo",40.5001069999,-3.9920997,,"EU","ES","ES-MD","Villanueva del Pardillo","no",,,,,,
@@ -24166,7 +24177,7 @@
 321564,"ES-0193","small_airport","Aeroclub Arnao UL",43.5531667,-7.0168,69,"EU","ES","ES-AS","Arnao","no",,,,,,
 321571,"ES-0194","small_airport","Aeródrome de Arcones",41.11453,-3.73378,,"EU","ES","ES-CL","Arcones","no",,,,,,
 321572,"ES-0195","small_airport","Pista Forestal Valdelamusa",37.7763167,-6.8826667,1135,"EU","ES","ES-AN","Valdelamusa","no",,,,,,
-321574,"ES-0196","small_airport","Tinajeros Airfield",39.09825,-1.72071,2822,"EU","ES","ES-CM","Tinajeros","no",,,,,,"Aeroclub Albacete"
+321574,"ES-0196","small_airport","Tinajeros Airfield",39.09825,-1.72071,2822,"AF","ES","ES-CM","Tinajeros","no","LETY",,,,,"Aeroclub Albacete"
 321576,"ES-0197","small_airport","Aeródromo de Espiel",38.2628667,-5.0442,2362,"EU","ES","ES-AN","Espiel","no",,,,,,
 321577,"ES-0198","small_airport","Aeródromo de La Vid de Bureba",42.632037,-3.311456,2297,"EU","ES","ES-CL","La Vid de Bureba","no","LEDB",,,,,"AeroLaVid"
 321580,"ES-0199","small_airport","Aeródromo de Aldeacentenara",39.5609167,-5.6637222,1772,"EU","ES","ES-EX","Aldeacentenara","no",,,,,,
@@ -24639,7 +24650,7 @@
 17204,"FA11","small_airport","Bird Field",30.622400283813477,-83.2593002319336,150,"NA","US","US-FL","Jennings","no","FA11",,"FA11",,,
 17205,"FA12","heliport","Shands Helistop",29.63909912109375,-82.34539794921875,334,"NA","US","US-FL","Gainesville","no","FA12",,"FA12",,,
 346974,"FA13","seaplane_base","Treasure Lagoon Seaplane Base",28.4475,-80.722361,0,"NA","US","US-FL","Cocoa","no","FA13",,"FA13",,,
-17206,"FA14","heliport","Broadway Helicopters Heliport",30.3976993560791,-86.59410095214844,10,"NA","US","US-FL","Fort Walton Beach","no","FA14",,"FA14",,,
+17206,"FA14","closed","Broadway Helicopters Heliport",30.397699,-86.594101,10,"NA","US","US-FL","Fort Walton Beach","no",,,,,,"FA14"
 17207,"FA15","heliport","Hamilton Helistop",30.523300170898438,-82.95649719238281,152,"NA","US","US-FL","Jasper","no","FA15",,"FA15",,,
 17208,"FA16","heliport","Jay Hospital Heliport",30.949899673461914,-87.15080261230469,252,"NA","US","US-FL","Jay","no","FA16",,"FA16",,,
 17209,"FA17","seaplane_base","Kissimmee Seaplane Base",28.289441,-81.404995,53,"NA","US","US-FL","Kissimmee","no","FA17",,"FA17",,,
@@ -29676,6 +29687,8 @@
 525696,"ID-0287","small_airport","Tebelian Airport",-0.041667,111.45639,97,"AS","ID","ID-U-A",,"no","WIOS","SQG",,,"https://en.wikipedia.org/wiki/Tebelian_Airport",
 525699,"ID-0288","small_airport","Siboru Airport",-2.928056,132.089447,406,"AS","ID","ID-PB","Fakfak","no",,,,,,
 525702,"ID-0289","small_airport","Douw Aturure Airport",-3.398056,135.397217,22,"AS","ID","ID-PT","Nabire","no","WABI","NBX",,,"https://en.wikipedia.org/wiki/Douw_Aturure_Airport",
+526304,"ID-0290","small_airport","Singkawang Airport (under construction)",0.793056,108.957497,,"AS","ID","ID-KB",,"no","WIOD","SKJ",,,"https://en.wikipedia.org/wiki/Singkawang_Airport",
+526307,"ID-0291","small_airport","Bolaang Mongondow Airport",0.885833,124.033058,,"AS","ID","ID-SA",,"no","WAMI",,,,"https://en.wikipedia.org/wiki/Raja_Loloda_Mokoagow_Airport",
 41361,"ID-AAS","small_airport","Apalapsili Airport",-3.882495,139.310932,3100,"AS","ID","ID-PP","Apalapsili","no","WAVR","AAS","APA",,"https://en.wikipedia.org/wiki/Apalapsili_Airport",
 41362,"ID-AGD","small_airport","Anggi Airport",-1.3858,133.8737,6644,"AS","ID","ID-PB","Anggi-Papua Island","no","WASG","AGD",,,"https://en.wikipedia.org/wiki/Anggi_Airport",
 43978,"ID-AHI","small_airport","Mina Wanam Airport",-7.540726,139.110916,22,"AS","ID","ID-PS","Wanam","no",,,,,,"WT82"
@@ -41673,7 +41686,7 @@
 4272,"LGLR","small_airport","Larissa Air Base",39.650253,22.4655,241,"EU","GR","GR-E","Larissa","no","LGLR","LRA",,,"https://en.wikipedia.org/wiki/Larissa_National_Airport","Larissa State Airport Thessaly"
 42449,"LGLX","heliport","Piraeus Heliport",37.991798400878906,23.574800491333008,30,"EU","GR","GR-I","El Pireo Port","no","LGLX",,,,,
 313897,"LGM","closed","Laiagam Airport",-5.4923,143.488,7267,"OC","PG","PG-EPW","Laiagam","no",,,,,,"LGM, LGM"
-4273,"LGMG","small_airport","Megara Airport",37.98109817504883,23.365400314331055,12,"EU","GR","GR-I","Megara","no","LGMG",,,,,
+4273,"LGMG","small_airport","Megara Air Base",37.981098,23.3654,12,"EU","GR","GR-I","Megara","no","LGMG",,,,,
 4274,"LGMK","medium_airport","Mykonos Island National Airport",37.435101,25.348101,405,"EU","GR","GR-L","Mykonos","yes","LGMK","JMK",,,"https://en.wikipedia.org/wiki/Mykonos_Island_National_Airport",
 30139,"LGML","small_airport","Milos Airport",36.696899,24.4769,10,"EU","GR","GR-L","Milos Island","yes","LGML","MLO",,,"https://en.wikipedia.org/wiki/Milos_Island_National_Airport",
 30114,"LGMR","closed","Marathon Wasser Airport",38.143902,24.0128,3,"EU","GR","GR-I","Marathon","no",,,,,,"LGMR, LGMR"
@@ -41700,7 +41713,7 @@
 4289,"LGSY","small_airport","Skiros Airport",38.9676017761,24.4871997833,44,"EU","GR","GR-H","Skiros Island","yes","LGSY","SKU",,,"https://en.wikipedia.org/wiki/Skyros_Island_National_Airport",
 4290,"LGTG","medium_airport","Tanagra Air Base",38.339802,23.565001,485,"EU","GR","GR-H","Tanagra","no","LGTG",,,,,
 4291,"LGTL","small_airport","Kasteli Airport",35.192001,25.327,1180,"EU","GR","GR-M","Crete Island","no","LGTL",,,,"https://en.wikipedia.org/wiki/Kasteli_Airport","Καστελίου"
-4292,"LGTP","small_airport","Tripolis Airport",37.530601501464844,22.403600692749023,2113,"EU","GR","GR-J","Trípoli","no","LGTP",,,,,
+4292,"LGTP","small_airport","Tripolis Air Base",37.530602,22.403601,2113,"AS","GR","GR-J","Trípoli","no","LGTP",,,,"https://en.wikipedia.org/wiki/Tripoli_Airport_(Greece)",
 4293,"LGTS","large_airport","Thessaloniki Macedonia International Airport",40.51928,22.970009,22,"EU","GR","GR-B","Thessaloniki","yes","LGTS","SKG",,,"https://en.wikipedia.org/wiki/Thessaloniki_International_Airport%2C_%22Macedonia%22","Makedonia. Macedonia. Salonica"
 4294,"LGTT","small_airport","Tatoi Airport",38.1088981628418,23.78380012512207,785,"EU","GR","GR-I","Tatoi","no","LGTT",,,,,
 42450,"LGVO","closed","Volos Army Airport",39.38389968869999,22.9174003601,112,"EU","GR","GR-E","Volos","no",,,,,,"LGVO, LGVO"
@@ -42388,10 +42401,10 @@
 30500,"LQJL","small_airport","Tuzla Jegin Lug Sport Airfield",44.4578,18.808122,869,"EU","BA","BA-BIH","Rainci Gornji","no","LQJL",,,,,
 30079,"LQLV","small_airport","Livno Brda Bosni Airport",43.791141,16.893268,2349,"EU","BA","BA-BIH","Livno","no","LQLV",,,,,
 4468,"LQMO","medium_airport","Mostar International Airport",43.282901763916016,17.84589958190918,156,"EU","BA","BA-BIH","Mostar","yes","LQMO","OMO",,"http://www.mostar-airport.ba/","https://en.wikipedia.org/wiki/Mostar_International_Airport",
-525388,"LQMP","small_airport","Medeno Polje Airport",44.57383,16.28217,1972,"EU","BA","BA-BIH",,"no","LQMP",,,,,
+525388,"LQMP","small_airport","Medeno Polje Airstrip",44.57383,16.28217,1972,"EU","BA","BA-BIH",,"no","LQMP",,,,,
 525317,"LQNI","small_airport","Sport Airfield Nisici Airport",44.069444,18.508974,3155,"EU","BA","BA-BIH",,"no","LQNI",,,,,
 30293,"LQPD","small_airport","Prijedor Urije Airport",44.993986,16.735457,591,"EU","BA","BA-SRP","Prijedor","no","LQPD",,,,,
-525747,"LQPP","small_airport","Sport Airfield Popovi Airport",44.767693,19.297417,310,"EU","BA","BA-SRP",,"no","LQPP",,,,,
+525747,"LQPP","small_airport","Sport Airfield Popovi",44.767693,19.297417,310,"EU","BA","BA-SRP",,"no","LQPP",,,,,
 4469,"LQSA","medium_airport","Sarajevo International Airport",43.8246,18.331499,1708,"EU","BA","BA-BIH","Sarajevo","yes","LQSA","SJJ",,"http://www.sarajevo-airport.ba/","https://en.wikipedia.org/wiki/Sarajevo_International_Airport",
 4470,"LQTZ","medium_airport","Tuzla International Airport",44.458698,18.7248,784,"EU","BA","BA-BIH","Dubrave Gornje","yes","LQTZ","TZL",,"http://www.tuzla-airport.ba/","https://en.wikipedia.org/wiki/Tuzla_International_Airport",
 30536,"LQVI","small_airport","Visoko Sport Airfield",44.024792,18.0968,1470,"EU","BA","BA-BIH","Visoko","no","LQVI",,,,"https://en.wikipedia.org/wiki/Visoko_Sport_Airfield",
@@ -53038,7 +53051,7 @@
 43665,"RU-0080","small_airport","Murmashi Airfield",68.8067,32.8077,245,"EU","RU","RU-MUR","Murmansk","no",,,"XLMN",,,"ЬЛМН, Аэродром Мурмаши"
 35019,"RU-0081","closed","Leonidovo Air Base",49.270554,142.928772,59,"AS","RU","RU-SAK","Leonidovo","no",,,,,"https://en.wikipedia.org/wiki/Leonidovo_(air_base)","Shisuka Naval Airfield"
 43670,"RU-0082","small_airport","Bolchary Airport",59.821293,68.829631,,"EU","RU","RU-KHM","Bolchary","no",,,,,,"Аэропорт Болчары"
-43674,"RU-0083","small_airport","Verkhnyaya Zolotitsa Airfield",65.691002,40.380402,,"AS","RU","RU-ARK",,"no","ULBW",,,,,"Verhnyaya Zolotitsa Airport, Аэропорт Верхняя Золотица, УЛБВ"
+43674,"RU-0083","small_airport","Verkhnyaya Zolotitsa Airfield",65.68571,40.36182,,"AS","RU","RU-ARK",,"no","ULBW",,,,,"Verhnyaya Zolotitsa Airport, Аэропорт Верхняя Золотица, УЛБВ"
 43677,"RU-0084","closed","Vozhgora Airport",64.539597,48.484901,262,"AS","RU","RU-ARK",,"no",,,,,,"Аэропорт Вожгора"
 43681,"RU-0085","small_airport","Dolgoshchelye Airport",66.053492,43.424625,,"EU","RU","RU-ARK","Dolgoshchelye","no","ULBD",,,,,"Dolgoschelye Airport, Аэропорт Долгощелье"
 43685,"RU-0086","closed","Zavetnoe Airport",47.135167,43.899133,431,"EU","RU","RU-ROS",,"no",,,,,,"УРРЫ, Zavetnoye Airport, Аэропорт Заветное, URRY"
@@ -53872,7 +53885,7 @@
 353553,"RU-0914","heliport","Novokrasnoye Heliport",54.32668,76.18341,348,"EU","RU","RU-NVS","Novokrasnoye","no",,,,,,
 353554,"RU-0915","heliport","Bol'shegrivskoye Heliport",53.91101,74.92926,292,"EU","RU","RU-OMS","Bol'shegrivskoye","no",,,,,,
 353555,"RU-0916","heliport","Russkaya Polyana Heliport",53.76374,73.88164,402,"EU","RU","RU-OMS","Russkaya Polyana","no",,,,,,
-353578,"RU-0917","small_airport","Slavyansk-na-Kubani Airfield",45.20633,38.08692,10,"AS","RU","RU-KDA","Slavyansk-na-Kubani","no",,,,,,
+353578,"RU-0917","small_airport","Slavyansk-na-Kubani Airfield",45.20633,38.08692,10,"AS","RU","RU-KDA","Slavyansk-na-Kubani","no","URSK",,,,,
 354388,"RU-0918","closed","Fyodorovka Airport",55.08796,72.995911,,"AS","RU","RU-OMS","Omsk","no",,,,,"https://en.wikipedia.org/wiki/Fyodorovka_Airport","ZF8F"
 355155,"RU-0919","heliport","Usad'ba Mansurovo Helicopter Base",51.774107,37.430463,676,"EU","RU","RU-KRS",,"no",,,"HH9Y",,,
 355513,"RU-0920","heliport","Kordon Ozernyy Heliport",51.48092,157.03785,283,"AS","RU","RU-KAM","Pauzhetka","no",,,,,,
@@ -56827,7 +56840,7 @@
 355976,"SI7B","small_airport","Fazenda Flores Airstrip",-6.56949,-48.21212,591,"SA","BR","BR-TO","Piraquê","no","SI7B",,"TO0113",,,
 355978,"SI7C","small_airport","Monte Sião Airstrip",-8.689444,-61.406944,502,"SA","BR","BR-AM","Novo Aripuanã","no","SI7C",,"AM0107",,,
 355981,"SI7D","small_airport","Fazenda Primavera Airport",-15.248889,-54.133056,1932,"SA","BR","BR-MT","Primavera do Leste","no","SI7D",,"MT0825",,,
-355720,"SI7F","small_airport","Fazenda Rio Verde Airport",-14.153958,-57.258375,1893,"SA","BR","BR-MT","Diamantino","no","SI7F",,"MT0826",,,
+355720,"SI7F","small_airport","Fazenda Rio Verde Airport",-14.153958,-57.258375,1893,"SA","BR","BR-MT","Diamantino","no","SI4O",,"MT0970",,,"SI7F, MT0826"
 355718,"SI7G","small_airport","Fazenda Nossa Senhora Aparecida Airport",-22.336858,-54.184656,1312,"SA","BR","BR-MS","Glória de Dourados","no","SI7G",,"MS0620",,,
 355716,"SI7H","small_airport","Sítio Bela Vista Airstrip",-22.543333,-47.2325,2123,"SA","BR","BR-SP","Limeira","no","SI7H",,"SP1333",,,
 514533,"SI7I","small_airport","ASL - Fazenda Santo Cristo Airport",-12.61459,-54.54779,1201,"SA","BR","BR-MT","Nova Ubiratã","no","SI7I",,"MT0966",,,
@@ -57352,7 +57365,7 @@
 42237,"SIPS","heliport","Haras Forum Heliport",-19.65932,-44.147551,2743,"SA","BR","BR-MG","Pedro Leopoldo","no","SIPS",,"MG0231",,,
 36190,"SIPT","heliport","Petrobrás Refinaria de Paulínea Replan Heliport",-22.731765,-47.137803,1955,"SA","BR","BR-SP","Paulínea","no","SIPT",,"SP0539",,,
 36191,"SIPU","small_airport","Fazenda Lagoa da Capa Airport",-19.448333740234,-47.362777709961,3567,"SA","BR","BR-MG","Perdizes","no",,,,,,"SIPU"
-36192,"SIPV","heliport","Aquarius Heliport",-23.60333251953125,-46.86555480957031,2726,"SA","BR","BR-SP","Cotia","no","SIPV",,,,,
+36192,"SIPV","heliport","Aquarius Heliport",-23.603333,-46.865555,2726,"SA","BR","BR-SP","Cotia","no",,,,,,"SIPV"
 36193,"SIPX","heliport","Gramado Heliport",-22.907754,-47.004265,2395,"SA","BR","BR-SP","Campinas","no","SIPX",,"SP0540",,,
 36194,"SIPY","small_airport","Ambrósio Airport",-1.9813890457153,-50.811389923096,96,"SA","BR","BR-PA","Portel","no",,,,,,"SIPY"
 36195,"SIPZ","heliport","Papaiz Heliport",-23.676378,-46.618209,2684,"SA","BR","BR-SP","Diadema","no","SIPZ",,"SP0541",,,
@@ -63072,7 +63085,7 @@
 315916,"TR-0041","small_airport","Fly Pergamon Sport Airfield",39.092842,27.148651,36,"AS","TR","TR-35","Bergama","no",,,,"http://www.flypergamon.com",,"fly, pergamon, bergama, sport, airfield, microlight, ultralight, gyrocopter"
 504979,"TR-0042","heliport","Osmancik Municipal Heliport",40.99646,34.77567,1430,"AS","TR","TR-19","Osmancik","no",,,,,,
 337484,"TR-0043","heliport","Titreyengöl Helipad",36.755223,31.446676,6,"AS","TR","TR-07","Manavgat","no",,,,,,"manavgat,titreyengöl"
-324731,"TR-0044","large_airport","Çukurova Regional Airport (under construction)",36.890908,35.070522,15,"AS","TR","TR-33","Tarsus","no","LTDB","COV",,,"https://en.wikipedia.org/wiki/%C3%87ukurova_International_Airport",
+324731,"TR-0044","large_airport","Çukurova International Airport (under construction)",36.890908,35.070522,19,"AS","TR","TR-33","Tarsus","no","LTDB","COV",,,"https://en.wikipedia.org/wiki/%C3%87ukurova_International_Airport",
 338979,"TR-0045","heliport","Ataköy Marina Helipad",40.97118,28.8695,,"EU","TR","TR-34","Bakırköy, Istanbul","no",,,,,,
 338980,"TR-0046","heliport","Acıbadem International Hospital Helipad",40.95844,28.83587,,"EU","TR","TR-34","Bakırköy, Istanbul","no",,,,,,
 338981,"TR-0047","heliport","Zeytinburnu Pier Helipad",40.98072,28.89584,,"EU","TR","TR-34","Zeytinburnu, Istanbul","no",,,,,,
@@ -72995,6 +73008,12 @@
 526230,"US-8455","heliport","Aero Products Heliport",34.254922,-110.000145,6415,"NA","US","US-AZ","Show Low","no","15AZ",,"15AZ",,,
 526240,"US-8456","small_airport","PK Field",30.318111,-90.955651,21,"NA","US","US-LA","Prairieville","no","24LA",,"24LA",,,
 526259,"US-8457","small_airport","Straeter Restricted Landing Area",38.741085,-89.567892,522,"NA","US","US-IL","Highland","no","26IL",,"26IL",,,
+526310,"US-8458","heliport","Coffin Bono Helicopter Launch Pad",43.288075,-74.981611,1250,"NA","US","US-NY","Town of Ohio","no","72NY",,"72NY",,,
+526314,"US-8459","heliport","RWJ University Hospital Hamilton Heliport",40.217269,-74.671575,97,"NA","US","US-NJ","Trenton","no","76NJ",,"76NJ",,,
+526335,"US-8460","small_airport","Elk Haven Airport",34.828099,-87.215825,705,"NA","US","US-AL","Rogersville","no","AL61",,"AL61",,,
+526353,"US-8461","heliport","Harbor UCLA Medical Center Interim West Heliport",33.828386,-118.297389,44,"NA","US","US-CA","Torrance","no","CN10",,"CN10",,,
+526358,"US-8462","small_airport","Bradway Pond Heliport",41.954389,-72.352167,714,"NA","US","US-CT","Stafford Springs","no","CT31",,"CT31",,,
+526391,"US-8463","heliport","Orlando Heli-Tours Margaritaville Heliport",28.345833,-81.608056,130,"NA","US","US-FL","Kissimmee","no","FA14",,"FA14",,,
 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"
@@ -74735,6 +74754,7 @@
 525278,"WAFS","small_airport","Sumarorong Airport",-3.147833,119.303333,3033,"AS","ID","ID-U-A",,"no","WAFS",,,,"https://id.wikipedia.org/wiki/Bandar_Udara_Sumarorong",
 506525,"WAFU","small_airport","Tanjung Api Airport",-0.865437,121.628625,49,"AS","ID","ID-ST","Tojo Una-Una","yes","WAFU","OJU",,,"https://en.wikipedia.org/wiki/Tanjung_Api_Airport","Ampana"
 26774,"WAFW","medium_airport","Syukuran Aminuddin Amir Airport",-1.035893,122.773934,56,"AS","ID","ID-ST","Luwok","no","WAFW","LUW",,,"https://en.wikipedia.org/wiki/Syukuran_Aminuddin_Amir_Airport","Bubung Airport, WAMW"
+526313,"WAFZ","small_airport","Pohuwato Airport",0.464722,121.818336,,"AS","ID","ID-GO",,"no","WAFZ",,,,,
 344101,"WAGB","small_airport","Haji Muhammad Sidik Airport",-1.02581,114.92881,145,"AS","ID","ID-KT","Muara Teweh","yes","WAGB","HMS",,,"https://en.wikipedia.org/wiki/Haji_Muhammad_Sidik_Airport","Trinsing"
 343797,"WAGF","small_airport","Seruyan Kuala Pembuang Airport",-3.376062,112.536521,13,"AS","ID","ID-KT","Seruyan","yes","WAGF","KLP",,,"https://en.wikipedia.org/wiki/Seruyan_Kuala_Pembuang_Airport","Kota Waringin Timur"
 26780,"WAGG","medium_airport","Tjilik Riwut Airport",-2.22513,113.943001,82,"AS","ID","ID-KT","Palangkaraya","yes","WAGG","PKY",,,"https://en.wikipedia.org/wiki/Tjilik_Riwut_Airport","WRBP, WAOP"
@@ -75058,6 +75078,7 @@
 41460,"WIMA","small_airport","Labuhan Bilik Airport",2.5129,100.179001,18,"AS","ID","ID-SU","Labuhan Bilik-Sumatra Island","no",,,,,,"WIMA"
 26836,"WIMB","medium_airport","Binaka Airport",1.16628,97.704327,20,"AS","ID","ID-SU","Gunungsitoli","yes","WIMB","GNS",,,"https://en.wikipedia.org/wiki/Binaka_Airport",
 26837,"WIME","medium_airport","Aek Godang Airport",1.4001,99.430496,922,"AS","ID","ID-SU","Padang Sidempuan","yes","WIME","AEG",,,"https://en.wikipedia.org/wiki/Aek_Godang_Airport",
+526312,"WIMF","small_airport","Jenderal Besar Abdul Haris Nasution Airport",0.948056,99.533333,,"AS","ID","ID-SS",,"no","WIMF",,,,,
 26838,"WIMG","medium_airport","Tabing Airport",-0.874989,100.351997,9,"AS","ID","ID-SB","Padang","yes",,,,,"https://en.wikipedia.org/wiki/Tabing_Airport","WIMG"
 32654,"WIMH","small_airport","Helvetia Airport",3.6830599308013916,98.64420318603516,49,"AS","ID","ID-SU","Helvetia-Sumatra Island","no","WIMH",,,,,
 26839,"WIMK","medium_airport","Soewondo Air Force Base",3.558425,98.672275,114,"AS","ID","ID-SU","Medan","no","WIMK","MES",,,"https://en.wikipedia.org/wiki/Soewondo_Air_Force_Base","Polonia International Airport, WIMM"
diff --git a/runways.csv b/runways.csv
index 4f325d5d8..7eb6bc405 100644
--- a/runways.csv
+++ b/runways.csv
@@ -3131,6 +3131,7 @@
 255526,9263,"29NC",1843,50,"TURF-G",0,0,"07",,,,,,"25",,,,,
 257095,9264,"29NE",2400,60,"TURF",0,0,"NW",,,,,,"SE",,,,,
 269836,9266,"29NJ",100,100,"TURF",0,0,"H1",,,,,,,,,,,
+526306,526305,"29NK",53,53,"Roof/Top",0,0,"H1",,,,,,,,,,,
 264329,45550,"29NY",50,50,"TURF",0,0,"H1",,,,,,,,,,,
 251383,9267,"29OH",1450,75,"TURF",1,0,"10",,,,,,"28",,,,,
 269837,9268,"29OI",30,30,"TURF",0,0,"H1",,,,,,,,,,,
@@ -6116,6 +6117,7 @@
 248912,11864,"51CL",2400,100,"ASPH",0,0,"09",,,,,,"27",,,,,
 248913,11864,"51CL",1600,100,"TURF",0,0,"18",,,,,,"36",,,,,
 247451,11865,"51CO",2600,100,"TURF",0,0,"01",,,,,,"19",,,,,
+526309,526308,"51FA",40,40,"CON",0,0,"H1",,,,,,,,,,,
 252955,11866,"51FD",1920,110,"TURF",0,0,"10",,,,,,"28",,,,,
 255208,11867,"51FL",3180,90,"TURF",0,0,"18",,,,,,"36",,,,359.1,100
 250183,11868,"51G",1933,100,"TURF-P",0,0,"03",43.14179992675781,-83.79840087890625,,31,,"21",43.14630126953125,-83.79460144042969,,211,
@@ -8828,6 +8830,7 @@
 324881,324880,"7MS3",2100,100,"Turf",0,0,"17",,,,,,"35",,,,,
 345692,345691,"7MS7",3800,60,"Turf",0,0,"17",,,,,,"35",,,,,
 347889,347886,"7MT5",1000,1000,"Turf",0,0,"H1",,,,,,,,,,,
+526321,526320,"7MY6",45,45,"CON",0,0,"H1",,,,,,,,,,,
 270626,45966,"7MY9",2600,95,"TURF",0,0,"9",,,,,,"27",,,,,
 266496,14256,"7N0",80,80,"CONC-G",0,0,"H1",,,,,,,,,,,
 258047,14258,"7N3",6000,300,"WATER",0,0,"01",,,,,,"19",,,,,
@@ -10204,6 +10207,7 @@
 266735,15476,"95XS",25,15,"CONC",0,0,"H3",,,,,,,,,,,
 253901,15477,"95Z",4100,60,"GRVL-TRTD-F",0,0,"15",,,,,478,"33",,,,254.1,540
 257346,15478,"96AK",2000,1400,"WATER",0,0,"18",,,,,,"36",,,,,
+526323,526322,"96AL",1400,200,"Turf",0,0,"18",,,,,,"36",,,,,
 247839,15479,"96C",2500,36,"ASPH-G",0,0,"01",42.747501373291016,-88.2500991821289,822,,,"19",42.754398345947266,-88.25070190429688,822,,
 266736,15480,"96CA",35,35,"CONC",0,0,"H1",,,,,,,,,,,
 266737,15481,"96CL",100,100,"ASPH",0,0,"H1",,,,,,,,,,360,
@@ -10332,6 +10336,7 @@
 256155,15585,"98OR",1300,50,"TURF",0,0,"17",,,,,,"35",,,,,
 257381,15586,"98PA",1200,100,"TURF",0,0,"NW",,,,,200,"SE",,,,226,330
 266771,15587,"98PN",60,60,"ASPH",0,0,"H1",,,,,,,,,,328.4,
+526325,526324,"98SC",2700,60,"Turf",0,0,"2",,,,,,"20",,,,,
 266772,15588,"98TA",40,40,"CONC",0,0,"H1",,,,,,,,,,,
 249446,15589,"98TE",1040,50,"TURF",0,0,"12",,,,,,"30",,,,,
 264566,45798,"98TN",3000,50,"ASPH",0,0,"14",,,,,,"32",,,,279,
@@ -12708,6 +12713,7 @@
 525767,525731,"BR-1884",3445,66,"GVL",0,0,"03",,,,,,"21",,,,,
 526145,526138,"BR-1885",82,82,"CON",0,0,"04",,,,,,,,,,,
 526160,526159,"BR-1886",4528,98,"ASP",0,0,"16",,,,,,"34",,,,,
+526330,526329,"BR-1888",3691,66,"GVL",0,0,"13",,,,,,"31",,,,,
 310917,30637,"BR-ALT",3280,75,"ASP",0,0,"10",,,,,,"28",,,,,
 310534,301802,"BSP",2772,98,"Grassed brown clay",0,0,"14",,,,,,"32",,,,,
 353793,353792,"BTZ",5906,,,0,0,,,,,,,,,,,,
@@ -13031,7 +13037,7 @@
 248497,755,"CCF9",2400,100,"TURF",0,0,"05",,,,,,"23",,,,,
 253101,756,"CCG3",3000,80,"SAND/GRAVEL/AS",0,0,"05",,,,,,"23",,,,,
 235019,757,"CCG4",3000,80,"ASP",0,0,"08",46.15169906616211,-64.77359771728516,,58,395,"26",46.15610122680664,-64.76360321044922,,238,
-259651,758,"CCH4",2500,,"UNK",0,0,"10",,,172,,,"28",,,209,,
+259651,758,"CCH4",2500,,"UNK",0,0,"09",,,172,,,"27",,,209,,
 255254,761,"CCI9",1700,75,"GRAVEL",0,0,"15",,,,,,"33",,,,,
 250757,762,"CCJ3",4000,60,"TREATED GRAVEL",0,0,"02",,,942,,,"20",,,958,,
 253825,763,"CCK3",3000,75,"TURF/GRAVEL/AS",0,0,"16",,,,,,"34",,,,,
@@ -13051,7 +13057,7 @@
 247051,771,"CCP4",2500,75,"GRAVEL",0,0,"12",,,335,,,"30",,,335,,
 234646,773,"CCQ3",3000,150,"ASP",0,0,"05",45.41740036010742,-63.46699905395508,134,27,,"23",45.42470169067383,-63.461700439453125,134,207,
 234647,773,"CCQ3",5000,150,"ASP",1,0,"09",45.41386795043945,-63.47056579589844,142,75.5,,"27",45.41787338256836,-63.45199966430664,142,255.5,
-234648,773,"CCQ3",5000,150,"ASP",0,0,"15",45.425301,-63.470299,130,139,500,"33",45.415001,-63.4575,135,319,
+234648,773,"CCQ3",5000,150,"ASP",0,0,"16",45.425301,-63.470299,130,139,500,"34",45.415001,-63.4575,135,319,
 234773,774,"CCR3",5400,100,"ASP",1,0,"18",46.433101654052734,-67.63179779052734,505,159,,"36",46.4192008972168,-67.62409973144531,454,339,
 235015,779,"CCS3",3000,75,"ASP",1,0,"14",45.20940017700195,-67.25559997558594,100,119.9,,"32",45.205299377441406,-67.24530029296875,100,299.9,
 234989,780,"CCS4",4022,50,"ASP",0,0,"09",46.14690017700195,-65.91169738769531,58,72,,"27",46.150299072265625,-65.89659881591797,64,252,
@@ -13150,7 +13156,7 @@
 254182,16703,"CD82",3515,150,"TURF",0,0,"17",,,,,,"35",,,,,
 257734,16704,"CD97",1375,60,"TURF",0,0,"16",,,,,,"34",,,,,
 252038,16705,"CD99",1800,50,"TURF-F",0,0,"17",,,,,,"35",,,,,
-234665,799,"CDA4",3000,75,"ASP",1,0,"13",47.717498779296875,-64.88829803466797,68,105,,"31",47.715301513671875,-64.87660217285156,68,285,
+234665,799,"CDA4",3000,75,"ASP",1,0,"12",47.717499,-64.888298,68,105,,"30",47.715302,-64.876602,68,285,
 234492,800,"CDA5",3000,75,"ASP",1,0,"18",47.77750015258789,-59.314998626708984,65,160.2,,"36",47.76969909667969,-59.31079864501953,23,340.2,
 251526,801,"CDA6",1660,50,"TURF",0,0,"11",,,,,,"29",,,,,
 253856,806,"CDC4",3000,100,"GRAVEL/TURF",0,0,"11",,,,,,"29",,,,,
@@ -13172,7 +13178,7 @@
 234485,822,"CDU9",2400,30,"ASP",0,0,"05",,,,38.7,,"23",,,,218.7,
 234486,822,"CDU9",3500,60,"ASP",0,0,"09",42.87139892578125,-79.60230255126953,,80,,"27",42.87310028076172,-79.58940124511719,,260,
 234444,823,"CDV2",4003,47,"ASP",0,0,"05",47.7489013671875,-67.4302978515625,857,31.9,,"23",47.758201599121094,-67.42169952392578,883,211.9,
-234725,827,"CDY3",3000,75,"ASP",1,0,"11",49.65679931640625,-54.24380111694336,76,81,,"29",49.65810012817383,-54.231201171875,74,261,
+234725,827,"CDY3",3000,75,"ASP",1,0,"10",49.656799,-54.243801,76,81,,"28",49.6581,-54.231201,74,261,
 271052,829,"CDY6",1728,30,"Gravel/Asphalt mix",0,0,"15",,,,,,"33",,,,,
 234448,830,"CEA3",1800,50,"GRS",0,0,"04",51.70940017700195,-114.11499786376953,,59.2,,"22",51.71189880371094,-114.10800170898438,,239.2,
 234449,830,"CEA3",3650,75,"ASP",1,0,"10",51.713600158691406,-114.11399841308594,,116.3,,"28",51.708946228027344,-114.09893035888672,,296.3,
@@ -13860,7 +13866,7 @@
 247045,1303,"CNF3",2550,100,"OLD ASP",0,0,"08",,,,,,"26",,,,,
 247046,1303,"CNF3",2650,100,"TURF",0,0,"13",,,,,,"31",,,,,
 247047,1303,"CNF3",2550,100,"OLD ASP",0,0,"17",,,,,,"35",,,,,
-235016,1304,"CNF4",2642,75,"GRS",0,0,"02",44.35969924926758,-78.78060150146484,882,9,360,"20",44.36690139770508,-78.77890014648438,882,189,
+235016,1304,"CNF4",2642,75,"GRS",0,0,"03",44.359699,-78.780602,882,9,360,"21",44.366901,-78.7789,882,189,
 235017,1304,"CNF4",3500,75,"ASP",1,0,"13",44.366600036621094,-78.78980255126953,882,119,,"31",44.362430572509766,-78.77788543701172,882,299,
 246342,1305,"CNF9",4400,60,"GRVL",0,0,"15",,,,,,"33",,,,,
 256728,1311,"CNJ3",2350,100,"ASP",0,0,"10",,,,,,"28",,,,,
@@ -14145,7 +14151,7 @@
 253838,1510,"CSE3",2750,100,"GRAVEL/TURF",0,0,"04",,,,,,"22",,,,,
 235042,1511,"CSE4",3989,100,"ASP",1,0,"10",45.63914489746094,-74.37818908691406,221,98.7,895,"28",45.63996887207031,-74.3626937866211,210,278.7,210
 234830,1512,"CSE5",3000,75,"ASP",1,0,"08",46.9994010925293,-70.52110290527344,,62,,"26",47.003299713134766,-70.5105972290039,,242,
-255277,1514,"CSF3",4025,75,"GRAVEL",0,0,"18",,,1987,,,"36",,,1979,,
+255277,1514,"CSF3",4025,75,"GRAVEL",0,0,"17",,,1987,,,"35",,,1979,,
 234504,1517,"CSG3",3250,75,"ASP",1,0,"15",46.04779815673828,-73.506103515625,,133.9,,"33",46.04169845581055,-73.49690246582031,,313.9,
 234475,1518,"CSG5",3100,30,"ASP",0,0,"02",46.680999755859375,-71.15190124511719,,2.5,300,"20",46.68949890136719,-71.15139770507812,,182.5,
 234476,1518,"CSG5",2550,50,"GVL",0,0,"06",,,,42.5,150,"24",,,,222.5,
@@ -14313,7 +14319,7 @@
 257480,1614,"CTR6",2000,40,"GRASS/SNOW",0,0,"15",,,,,,"33",,,,,
 255989,1616,"CTT2",1600,50,"GRASS",0,0,"04",,,,,,"22",,,,,
 234433,1617,"CTT5",3938,100,"ASP",1,0,"11",50.259899,-60.6824,90,93,,"29",50.2593,-60.6656,90,273,
-250766,1618,"CTU2",4900,150,"GRAVEL",0,0,"10",,,1544,,,"28",,,1550,,
+250766,1618,"CTU2",4900,150,"GRAVEL",0,0,"09",,,1544,,,"27",,,1550,,
 250787,1620,"CTY5",2200,65,"GRASS",0,0,"06",,,,,,"24",,,,,
 508904,508894,"CVA3",40,40,"CON",0,0,"H-East",49.8678,-119.56008,,,,,,,,,
 508903,508894,"CVA3",40,40,"CON",0,0,"H-West",49.86758,-119.56136,,,,,,,,,
@@ -14337,7 +14343,7 @@
 354465,35128,"CY-NIC",9725,148,"concrete",0,1,"14",35.161515,,719,145,,"32",35.141727,33.284315,702,325,800
 271077,46596,"CYAB",3935,98,"Gravel",1,0,"13",73.00968933105469,-85.06182861328125,70,128,,"31",73.00308990478516,-85.0328140258789,70,308,
 251527,1652,"CYAC",3900,100,"GRVL",0,0,"11",,,1339,,,"29",,,1336,,
-253833,1653,"CYAD",5000,150,"GRAVEL",0,0,"11",,,775,,,"29",,,747,,
+253833,1653,"CYAD",5000,150,"GRAVEL",0,0,"10",,,775,,,"28",,,747,,
 234703,1654,"CYAG",2600,75,"ASP",1,0,"03",48.652801513671875,-93.44529724121094,1120,34.8,,"21",48.658599853515625,-93.43920135498047,1125,214.8,
 234704,1654,"CYAG",4500,100,"ASP",1,0,"12",48.65800094604492,-93.4480972290039,1123,126,,"30",48.65079879760742,-93.43299865722656,1119,306,
 251536,1655,"CYAH",5000,150,"GRAVEL",0,0,"09",,,993,,,"27",,,1002,,
@@ -14384,7 +14390,7 @@
 234751,1682,"CYBW",3423,100,"ASP",1,0,"08",51.10480499267578,-114.37853240966797,3935,90,,"26",51.104801177978516,-114.36405944824219,3934,270,
 234752,1682,"CYBW",5000,98,"ASP",1,0,"17",51.11216735839844,-114.37875366210938,3930,181,,"35",51.098472595214844,-114.37873077392578,3940,1,
 234828,1683,"CYBX",4500,150,"ASP",1,0,"05",51.43659973144531,-57.19089889526367,79,27.5,,"23",51.447601318359375,-57.181800842285156,121,207.5,
-250002,1684,"CYCA",2500,75,"GRAVEL",0,0,"09",,,40,,,"27",,,40,,
+250002,1684,"CYCA",2500,75,"GRAVEL",0,0,"08",,,40,,,"26",,,40,,
 235074,1685,"CYCB",5000,150,"GVL",1,0,"13T",69.11219787597656,-105.15399932861328,89,127.4,,"31T",69.10389709472656,-105.12300109863281,61,307.4,
 234871,1686,"CYCC",3500,100,"ASP",1,0,"10",45.092201232910156,-74.56999969482422,171,83.3,,"28",45.093299865722656,-74.55670166015625,168,263.3,
 234602,1687,"CYCD",6602,150,"ASP",1,0,"16",49.059200286865234,-123.87000274658203,75,181,197,"34",49.045501708984375,-123.87000274658203,92,1,1002
@@ -14467,7 +14473,7 @@
 234893,1749,"CYGR",3600,150,"ASP",1,0,"16",47.42940139770508,-61.78580093383789,9,138.7,,"34",47.42190170288086,-61.776100158691406,35,318.7,
 259659,1750,"CYGT",4095,100,"GRAVEL",0,0,"15T",69.36927795410156,-81.82544708251953,174,,,"33T",69.36004638671875,-81.80751037597656,158,,
 234741,1751,"CYGV",4500,100,"ASP",1,0,"08",50.27920150756836,-63.619998931884766,109,63,,"26",50.284698486328125,-63.60279846191406,124,243,
-253832,1752,"CYGW",5052,150,"SAND/GRAVEL",0,0,"04",,,32,,,"22",,,26,,
+253832,1752,"CYGW",5052,150,"SAND/GRAVEL",0,0,"03",,,32,,,"21",,,26,,
 255991,1753,"CYGX",5000,150,"GRAVEL",0,0,"05",,,476,,,"23",,,474,,
 259663,1755,"CYHA",3520,,"UNK",0,0,"18",,,100,,,"36",,,91,,
 234985,1756,"CYHB",5000,100,"ASP",1,0,"05",52.813899993896484,-102.3219985961914,1106,66,,"23",52.819400787353516,-102.3010025024414,1159,246,
@@ -14483,7 +14489,7 @@
 234740,1763,"CYHM",10006,200,"ASP",1,0,"12",43.180599,-79.953102,772,107,1600,"30",43.172199,-79.917503,765,287,
 234787,1764,"CYHN",3500,75,"ASP",1,0,"07",49.19060134887695,-84.76529693603516,1099,59.1,,"25",49.19559860229492,-84.75250244140625,1087,239.1,
 253084,1765,"CYHO",2500,75,"GRAVEL",0,0,"06",,,,,,"24",,,,,
-234962,1766,"CYHR",4500,150,"ASP",1,0,"08",50.46540069580078,-59.64459991455078,31,55,,"26",50.47249984741211,-59.62879943847656,39,235,
+234962,1766,"CYHR",4500,150,"ASP",1,0,"07",50.465401,-59.6446,31,76,,"25",50.4725,-59.628799,39,256,
 234947,1436,"CYHS",4000,75,"ASP",1,0,"01",44.152801513671875,-81.06279754638672,909,360,,"19",44.16389846801758,-81.06279754638672,935,180,
 234948,1436,"CYHS",2500,50,"ASP",0,0,"09",44.157798767089844,-81.06749725341797,920,80.7,330,"27",44.15890121459961,-81.05809783935547,915,260.7,120
 256451,1767,"CYHT",5000,100,"GRVL",0,0,"04",,,,,,"22",,,,,
@@ -14496,7 +14502,7 @@
 234673,1770,"CYHZ",7700,200,"ASP",1,0,"14",44.89360046386719,-63.5182991027832,435,126,,"32",44.881099700927734,-63.49420166015625,476,306,
 234708,1771,"CYIB",3500,100,"ASP",1,0,"04",48.770301818847656,-91.64330291748047,1385,39.1,,"22",48.7776985168457,-91.63410186767578,1408,219.1,
 234450,1772,"CYID",3950,75,"ASP",1,0,"06",44.541900634765625,-65.79090118408203,460,42.7,,"24",44.54990005493164,-65.78060150146484,499,222.7,
-234496,1773,"CYIF",4590,100,"ASP",1,0,"02",51.20539855957031,-58.657100677490234,19,352.9,,"20",51.217899322509766,-58.65959930419922,13,172.9,
+234496,1773,"CYIF",4590,100,"ASP",1,0,"01",51.205399,-58.657101,19,353,,"19",51.217899,-58.659599,13,173,
 235092,1774,"CYIK",3521,100,"GVL",1,0,"07",62.41419982910156,-77.93329620361328,103,51,,"25",62.42020034790039,-77.91719818115234,123,231,
 235068,1775,"CYIO",4000,100,"GVL",1,0,"02T",72.67829895019531,-77.97380065917969,181,23,,"20T",72.68840026855469,-77.95950317382812,170,203,
 249259,1776,"CYIV",4000,100,"CRUSHED ROCK",0,0,"12",53.86009979248047,-94.64559936523438,770,123,,"30",53.85390090942383,-94.64559936523438,770,303,
@@ -14554,12 +14560,12 @@
 234842,1813,"CYMJ",3400,100,"ASP",1,0,"03",50.32609939575195,-105.55799865722656,1891,44,,"21",50.332801818847656,-105.5479965209961,1873,224,
 234844,1813,"CYMJ",8326,150,"ASP",1,0,"11L",50.33789825439453,-105.57499694824219,1882,118.5,,"29R",50.32699966430664,-105.54299926757812,1880,298.5,
 234843,1813,"CYMJ",7280,150,"ASP",1,0,"11R",50.33110046386719,-105.5739974975586,1891,118,,"29L",50.32170104980469,-105.5459976196289,1892,298,
-234979,1814,"CYML",4500,150,"ASP",1,0,"15",47.60110092163086,-70.2311019897461,977,127,,"33",47.59389877319336,-70.2166976928711,951,307,
+234979,1814,"CYML",4500,150,"ASP",1,0,"14",47.601101,-70.231102,977,127,,"32",47.593899,-70.216698,951,307,
 234961,1815,"CYMM",7503,150,"ASP",1,0,"08",56.6531982421875,-111.24199676513672,1205,90,,"26",56.6531982421875,-111.20700073242188,1207,270,500
 234818,1816,"CYMO",4000,100,"ASP",1,0,"06",51.28810119628906,-80.60890197753906,26,43,,"24",51.29610061645508,-80.5969009399414,25,223,
 234819,1816,"CYMO",3500,100,"COM",1,0,"14",51.29499816894531,-80.61969757080078,30,127,,"32",51.28919982910156,-80.60749816894531,26,307,
-234515,1817,"CYMT",6496,150,"ASP",1,0,"05",49.763999938964844,-74.53450012207031,1262,28.3,,"23",49.779701232910156,-74.52149963378906,1270,208.3,
-247762,1818,"CYMU",3500,100,"GRAVEL",0,0,"03",,,246,,,"21",,,250,,
+234515,1817,"CYMT",6496,150,"ASP",1,0,"04",49.764,-74.5345,1262,28,,"22",49.779701,-74.5215,1270,208,
+247762,1818,"CYMU",3500,100,"GRAVEL",0,0,"02",,,246,,,"20",,,250,,
 234837,1819,"CYMW",4920,150,"ASP",1,0,"03",46.268001556396484,-75.9927978515625,613,17,,"21",46.28089904785156,-75.98719787597656,656,197,
 234624,1820,"CYMX",12000,200,"CON",1,0,"06",45.67040252685547,-74.0217514038086,256,45.4,,"24",45.69369125366211,-73.98856353759766,238,225.4,
 234625,1820,"CYMX",8852,200,"CON",0,0,"11",45.670799255371094,-74.08999633789062,247,98.2,,"29",45.666099548339844,-74.0436019897461,270,278.2,
@@ -14571,7 +14577,7 @@
 234946,1826,"CYNH",5200,100,"ASP",0,0,"05",56.033599853515625,-121.98799896240234,,74.1,200,"23",56.037498474121094,-121.96399688720703,,254.1,200
 253834,1827,"CYNJ",2100,75,"ASPHALT",1,0,"01",,,34,,100,"19",,,34,,100
 253835,1827,"CYNJ",2743,75,"Asphalt",0,0,"07",,,,,648,"25",,,,,337
-249272,1828,"CYNL",6000,100,"GRAVEL",0,0,"15",,,1605,,,"33",,,1589,,
+249272,1828,"CYNL",6000,100,"GRAVEL",0,0,"16",,,1605,,,"34",,,1589,,
 234955,1829,"CYNM",5000,100,"ASP",1,0,"15",49.76649856567383,-77.81009674072266,908,134.2,,"33",49.756900787353516,-77.7948989868164,918,314.2,
 248491,1830,"CYNN",3350,80,"GRAVEL/SAND",0,0,"17",,,,,,"35",,,,,
 259647,1831,"CYNR",6000,,"UNK",0,0,"17",,,911,,,"35",,,909,,
@@ -14672,7 +14678,7 @@
 259621,1892,"CYRP",2205,65,"GVL",0,0,"04",,,,27,196,"22",,,,207,98
 234922,1892,"CYRP",3937,98,"ASP",1,0,"10",45.318599700927734,-76.02970123291016,381,84,,"28",45.319698333740234,-76.01470184326172,381,264,
 234805,1893,"CYRQ",9006,150,"ASP",1,0,"05",46.345699310302734,-72.68560028076172,190,31.4,,"23",46.359798431396484,-72.67320251464844,199,211.4,
-257478,1894,"CYRS",3555,85,"CRUSHED ROCK",0,0,"08",,,729,,,"26",,,729,,
+257478,1894,"CYRS",3555,85,"CRUSHED ROCK",0,0,"09",,,729,,,"27",,,729,,
 234505,1895,"CYRT",6000,150,"ASP",1,0,"13T",62.81660079956055,-92.12979888916016,85,129,,"31T",62.80619812011719,-92.10189819335938,94,309,
 234939,1896,"CYRV",4800,75,"ASP",0,0,"12",50.971500396728516,-118.19000244140625,1457,138,,"30",50.96179962158203,-118.1760025024414,1459,318,300
 234907,1323,"CYSA",5000,100,"ASP",1,0,"05",43.41059875488281,-80.94000244140625,1208,42,,"23",43.420799255371094,-80.92749786376953,1208,222,1030
@@ -14699,7 +14705,7 @@
 248583,1910,"CYSQ",3950,75,"GRVL",0,0,"19",,,2348,,,"01",,,2348,,
 235067,1911,"CYSR",6400,150,"GVL",1,0,"11T",72.98359680175781,-84.6427001953125,2106,106,,"29T",72.97889709472656,-84.58519744873047,2089,286,
 257483,1912,"CYST",3400,75,"CRUSHED ROCK",0,0,"04",,,773,,,"22",,,773,,
-234853,1913,"CYSU",8000,200,"ASP",1,0,"06",46.431400299072266,-63.84280014038086,48,36,,"24",46.44919967651367,-63.82419967651367,33,216,
+234853,1913,"CYSU",8000,200,"ASP",1,0,"05",46.4314,-63.8428,48,36,,"23",46.4492,-63.8242,33,216,
 234854,1913,"CYSU",5300,150,"ASP",0,1,"12",46.44419860839844,-63.84109878540039,43,94.6,,"30",46.44309997558594,-63.82080078125,64,274.6,
 234855,1913,"CYSU",5460,150,"ASP",0,1,"18",46.44329833984375,-63.84109878540039,,157.5,,"36",46.42940139770508,-63.832801818847656,,337.5,
 234940,1914,"CYSW",4000,75,"ASP",0,0,"17",49.83879852294922,-114.88300323486328,,185,,"35",49.82789993286133,-114.88400268554688,,5,
@@ -14708,8 +14714,8 @@
 235020,1917,"CYTA",5000,100,"ASP",1,0,"17",45.87080001831055,-77.25559997558594,528,157,,"35",45.85810089111328,-77.247802734375,525,337,
 235088,1918,"CYTE",4000,100,"GVL",1,0,"13T",64.2332992553711,-76.53669738769531,153,127,,"31T",64.22669982910156,-76.5167007446289,139,307,
 234963,1919,"CYTF",4300,100,"ASP",1,0,"13",48.51110076904297,-71.6500015258789,429,113.8,,"31",48.50640106201172,-71.63390350341797,445,293.8,
-234916,1920,"CYTH",5800,150,"ASP",1,0,"05",55.7963981628418,-97.87470245361328,716,61,,"23",55.804100036621094,-97.85009765625,716,241,
-234917,1920,"CYTH",2500,100,"GVL",1,0,"14",55.80609893798828,-97.8593978881836,729,151,,"32",55.80030059814453,-97.85359954833984,702,331,
+234916,1920,"CYTH",5800,150,"ASP",1,0,"06",55.796398,-97.874702,716,61,,"24",55.8041,-97.850098,716,241,
+234917,1920,"CYTH",2500,100,"GVL",1,0,"15",55.806099,-97.859398,729,151,,"33",55.800301,-97.8536,702,331,
 247021,1921,"CYTL",3900,100,"GRVL",0,0,"14",,,729,,,"32",,,709,,
 234734,1922,"CYTN",5377,145,"ASP",1,0,"06",45.60710144042969,-62.62810134887695,312,46,,"24",45.616600036621094,-62.61410140991211,251,226,
 234735,1922,"CYTN",2200,60,"ASP",0,0,"10",45.61000061035156,-62.627601623535156,315,81.8,,"28",45.61090087890625,-62.61909866333008,306,261.8,
@@ -14729,7 +14735,7 @@
 235070,1930,"CYUX",5410,150,"GVL",1,0,"12T",68.7802963256836,-81.2605972290039,27,124,,"30T",68.77200317382812,-81.22669982910156,18,304,192
 234664,1931,"CYUY",7485,150,"ASP",1,0,"08",48.20100021362305,-78.8488998413086,974,62,,"26",48.210601806640625,-78.82170104980469,988,242,
 234891,1932,"CYVB",5985,150,"ASP",1,0,"13",48.074501037597656,-65.47129821777344,123,115,,"31",48.06760025024414,-65.4490966796875,98,295,
-234918,1933,"CYVC",2396,50,"GVL",0,0,"10",55.150901794433594,-105.27400207519531,1239,112,,"28",55.14849853515625,-105.26300048828125,1220,292,
+234918,1933,"CYVC",2396,50,"GVL",0,0,"11",55.150902,-105.274002,1239,112,,"29",55.148499,-105.263,1220,292,
 234919,1933,"CYVC",5000,150,"ASP",1,0,"18",55.15810012817383,-105.26000213623047,1242,189,,"36",55.14459991455078,-105.26399993896484,1222,9.1,
 252325,1934,"CYVD",4000,75,"ASPHALT",0,0,"08",,,1451,,,"26",,,1454,,
 234535,1935,"CYVG",3300,75,"ASP",1,0,"10",53.35810089111328,-110.83000183105469,2019,119,,"28",53.35390090942383,-110.81700134277344,2020,299,1100
@@ -14755,9 +14761,9 @@
 259652,1948,"CYWJ",3933,,"UNK",0,0,"07",,,703,,,"25",,,683,,
 234689,1949,"CYWK",6002,150,"ASP",1,0,"18",52.93046569824219,-66.86924743652344,1794,157,,"36",52.91498565673828,-66.86009979248047,1808,337,
 234956,1950,"CYWL",7000,150,"ASP",1,0,"12",52.189201,-122.064003,3082,135,,"30",52.1758,-122.042999,3074,315,
-234438,1951,"CYWM",4000,100,"ASP",1,0,"16",54.748600006103516,-113.2040023803711,1966,181,,"34",54.73780059814453,-113.2040023803711,1971,1,
+234438,1951,"CYWM",4000,100,"ASP",1,0,"17",54.7486,-113.204002,1966,181,,"35",54.737801,-113.204002,1971,1,
 250793,1952,"CYWP",3500,100,"GRVL",0,0,"02",,,,,,"20",,,,,
-234888,1953,"CYWV",3000,75,"ASP",1,0,"12",52.79890060424805,-110.86199951171875,,139,,"30",52.79280090332031,-110.85299682617188,,319,
+234888,1953,"CYWV",3000,75,"ASP",1,0,"13",52.798901,-110.862,,139,,"31",52.792801,-110.852997,,319,
 235095,1954,"CYWY",3500,100,"GVL",1,0,"11",63.21260070800781,-123.44499969482422,474,131.4,495,"29",63.206298828125,-123.42900085449219,489,311.4,
 234763,1955,"CYXC",6000,150,"ASP",1,0,"16",49.61970138549805,-115.78299713134766,3034,178.1,,"34",49.60329818725586,-115.78199768066406,3082,358.1,
 234660,1956,"CYXD",5870,200,"ASP",1,0,"12",53.57780075073242,-113.52799987792969,2200,138.2,800,"30",53.56560134887695,-113.51000213623047,2182,318.2,1183
@@ -14838,11 +14844,11 @@
 234984,1992,"CYZE",4900,100,"ASP",1,0,"11",45.88610076904297,-82.57720184326172,603,97.2,,"29",45.8843994140625,-82.55829620361328,613,277.2,
 234952,1993,"CYZF",5000,150,"ASP",1,0,"10",62.47129821777344,-114.4530029296875,672,116,,"28",62.465301513671875,-114.427001953125,675,294,
 234953,1993,"CYZF",7500,150,"ASP",1,0,"16",62.473201751708984,-114.44400024414062,674,176,,"34",62.45280075073242,-114.44100189208984,658,356,
-259664,1994,"CYZG",3500,,"UNK",0,0,"04",,,722,,,"22",,,742,,
+259664,1994,"CYZG",3500,,"UNK",0,0,"03",,,722,,,"21",,,742,,
 235044,1995,"CYZH",5561,100,"ASP",1,0,"10",55.29650115966797,-114.79000091552734,1904,114.7,,"28",55.29010009765625,-114.76599884033203,1912,294.7,557
 234838,1996,"CYZP",5120,150,"ASP",1,0,"13",53.2599983215332,-131.8209991455078,17,144,,"31",53.248600006103516,-131.8070068359375,21,324,
-234564,1997,"CYZR",2989,75,"ASP",0,0,"05",42.996700286865234,-82.31109619140625,591,49.2,,"23",43.00189971923828,-82.30280303955078,590,229.2,
-234565,1997,"CYZR",5100,100,"ASP",1,0,"14",43.004398345947266,-82.31529998779297,590,137,,"32",42.99420166015625,-82.30220031738281,594,317,
+234564,1997,"CYZR",2989,75,"ASP",0,0,"06",42.9967,-82.311096,591,49,,"24",43.0019,-82.302803,590,229,
+234565,1997,"CYZR",5100,100,"ASP",1,0,"15",43.004398,-82.3153,590,137,,"33",42.994202,-82.3022,594,317,
 235086,1998,"CYZS",5000,100,"GVL",1,0,"16T",64.19950103759766,-83.36609649658203,210,155,,"34T",64.18710327148438,-83.35279846191406,184,335,
 234912,1999,"CYZT",4000,150,"ASP",1,0,"08",50.680599,-127.375999,71,92,,"26",50.68,-127.358002,33,272,
 234913,1999,"CYZT",5000,150,"ASP",1,0,"11",50.686100006103516,-127.37300109863281,43,129.3,,"29",50.67720031738281,-127.35700225830078,35,309.3,
@@ -14902,7 +14908,7 @@
 234549,2010,"CZBF",4500,100,"ASP",1,0,"10",47.62879943847656,-65.74800109863281,193,82,,"28",47.63050079345703,-65.72989654541016,178,262,
 234870,2011,"CZBM",5000,100,"ASP",1,0,"05",45.285484,-72.747879,345,37,,"23",45.296387,-72.736069,375,217,
 234869,2011,"CZBM",3200,320,"GRS",0,0,"05R",45.287200927734375,-72.743896484375,,34.2,,"23L",45.29439926147461,-72.73690032958984,,214.2,
-248483,2012,"CZEE",2590,75,"GRAVEL",0,0,"11",,,,,,"29",,,,,
+248483,2012,"CZEE",2590,75,"GRAVEL",0,0,"12",,,,,,"30",,,,,
 250765,2013,"CZEM",3510,100,"GRAVEL",0,0,"02",,,21,,,"20",,,24,,
 353840,353839,"CZF2",1036,30,"Turf",0,0,"02",,,,23,,"20",,,,203,
 235099,2014,"CZFA",4000,100,"GVL",1,0,"09",62.20970153808594,-133.38699340820312,2351,113.7,,"27",62.205299377441406,-133.36500549316406,2334,293.7,
@@ -14914,22 +14920,22 @@
 255259,2020,"CZGI",3540,80,"CRUSHED ROCK",0,0,"09",,,605,,,"27",,,627,,
 251538,2021,"CZGR",2800,75,"CRUSHED ROCK",0,0,"18",,,,,,"36",,,,,
 234705,2022,"CZHP",3933,75,"ASP",1,0,"07",55.39350128173828,-116.48500061035156,1974,88.5,,"25",55.393699645996094,-116.46600341796875,1972,268.5,
-251534,2023,"CZJG",3800,100,"GRAVEL",0,0,"14",,,,,,"32",,,,,
+251534,2023,"CZJG",3800,100,"GRAVEL",0,0,"15",,,,,,"33",,,,,
 235027,2024,"CZJN",3933,100,"ASP",1,0,"02",52.11579895019531,-101.23999786376953,,27,,"20",52.12540054321289,-101.23200225830078,,207,
 235028,2024,"CZJN",1950,75,"GRS",0,0,"08",52.1161003112793,-101.23999786376953,,85,,"26",52.11650085449219,-101.23200225830078,,265,
 267410,17059,"CZK",1800,30,"ASPH-G",0,0,"06",,,,,,"24",,,,309,242
-255264,2025,"CZKE",3500,100,"GRVL",0,0,"07",,,,,,"25",,,,,
-247760,2026,"CZLQ",2220,75,"CRUSHED ROCK",0,0,"11",,,,,,"29",,,,,
+255264,2025,"CZKE",3500,100,"GRVL",0,0,"06",,,,,,"24",,,,,
+247760,2026,"CZLQ",2220,75,"CRUSHED ROCK",0,0,"12",,,,,,"30",,,,,
 254563,2027,"CZMD",3500,100,"GRVL",0,0,"05",,,896,,,"23",,,911,,
 234581,2028,"CZML",5293,75,"ASP",1,0,"15",51.74300003051758,-121.33699798583984,3125,165,415,"33",51.73030090332031,-121.33000183105469,3094,345,
 254565,2029,"CZMN",2200,75,"CRUSHED ROCK",0,0,"05",,,,,,"23",,,,,
 235043,2030,"CZMT",5000,100,"ASP",1,0,"13",54.030399322509766,-132.12399291992188,7,148.3,,"31",54.01919937133789,-132.11099243164062,25,328.3,250
 256959,17060,"CZN",3000,50,"TURF-GRVL-F",0,0,"12",,,,,,"30",,,,,
-253091,2031,"CZNG",2500,60,"CRUSHED ROCK",0,0,"09",,,,,,"27",,,,,
+253091,2031,"CZNG",2500,60,"CRUSHED ROCK",0,0,"10",,,,,,"28",,,,,
 234503,2032,"CZNL",3100,75,"ASP",0,0,"04",49.49190139770508,-117.30599975585938,,61,,"22",49.49610137939453,-117.29499816894531,,241,200
 254043,17061,"CZO",2060,90,"TURF-GRVL-P",0,0,"01",,,,,,"19",,,,,
 253854,2033,"CZPB",3500,100,"GRVL",0,0,"10",,,,,,"28",,,,,
-234731,2034,"CZPC",6600,100,"ASP",1,0,"07",49.520599365234375,-114.01100158691406,3903,89.6,400,"25",49.520599365234375,-113.98300170898438,3903,269.6,1200
+234731,2034,"CZPC",6600,100,"ASP",1,0,"08",49.520599,-114.011002,3903,90,400,"26",49.520599,-113.983002,3903,270,1200
 248493,2035,"CZPO",3000,65,"GRAVEL/CLAY",0,0,"16",,,1267,,,"34",,,1268,,
 249281,2036,"CZRJ",3500,100,"GRVL",0,0,"03",,,955,,,"21",,,974,,
 255282,2037,"CZSJ",3500,100,"GRVL",0,0,"11",,,944,,,"29",,,937,,
@@ -14941,8 +14947,8 @@
 234532,2043,"CZUM",5500,150,"ASP",1,0,"13",53.56449890136719,-64.11820220947266,1436,104.5,,"31",53.560699462890625,-64.09369659423828,1429,284.5,
 234481,2044,"CZVL",5001,100,"ASP",1,0,"08",53.673824310302734,-113.86203002929688,,103,,"26",53.67144775390625,-113.83931732177734,,283,
 234482,2044,"CZVL",3500,100,"ASP",1,0,"16",53.67223358154297,-113.8652114868164,,181,,"34",53.66265869140625,-113.8652114868164,,1,
-253087,2045,"CZWH",3500,100,"CRUSHED ROCK",0,0,"02",,,,,,"20",,,,,
-250795,2046,"CZWL",3800,75,"TREATED GRAVEL",0,0,"16",,,,,,"34",,,,,
+253087,2045,"CZWH",3500,100,"CRUSHED ROCK",0,0,"03",,,,,,"21",,,,,
+250795,2046,"CZWL",3800,75,"TREATED GRAVEL",0,0,"17",,,,,,"35",,,,,
 270825,45971,"D03",2800,120,"TURF",1,0,"12",46.308998107910156,-98.94339752197266,1959,,,"30",46.30459976196289,-98.9343032836914,1957,,
 248904,17062,"D06",2600,100,"CONC-TURF-F",0,0,"17",48.296199798583984,-97.39409637451172,825,,,"35",48.289100646972656,-97.39409637451172,818,,
 267411,17063,"D12",22,18,"CONC",0,0,"H1",,,,,,,,,,,
@@ -25121,9 +25127,9 @@
 242040,3876,"KSFB",9600,150,"ASP",1,0,"09L",28.781700134277344,-81.25599670410156,55,90,1000,"27R",28.78179931640625,-81.22599792480469,36,270,600
 242039,3876,"KSFB",3500,75,"ASP",1,0,"09R",28.769899368286133,-81.23560333251953,46,89.9,,"27L",28.770000457763672,-81.22470092773438,28,269.9,
 242041,3876,"KSFB",6003,150,"PEM",1,0,"18",28.783300399780273,-81.23480224609375,49,180,,"36",28.766799926757812,-81.23470306396484,43,360,
-254016,3877,"KSFF",6000,100,"WATER",0,0,"03W",,,,,,"21W",,,,,
-243980,3877,"KSFF",4500,150,"CON",1,0,"04L",47.67919921875,-117.33100128173828,1943,54,,"22R",47.6864013671875,-117.31700134277344,1953,234,
-243979,3877,"KSFF",3059,75,"ASP",1,0,"04R",47.68040084838867,-117.32599639892578,1947,54,415,"22L",47.685298919677734,-117.31500244140625,1950,234,
+254016,3877,"KSFF",6000,100,"WATER",0,0,"3W",,,,,,"21W",,,,,
+243980,3877,"KSFF",4500,150,"CON",1,0,"4L",47.679199,-117.331001,1943,54,,"22R",47.686401,-117.317001,1953,234,
+243979,3877,"KSFF",2650,75,"ASP",1,0,"4R",47.680401,-117.325996,1951,54,,"22L",47.685299,-117.315002,1954,234,
 242508,21057,"KSFM",6000,150,"ASP",0,1,"01",43.3838996887207,-70.71420288085938,,358.6,,"19",43.400299072265625,-70.7146987915039,,178.6,
 242509,21057,"KSFM",6000,150,"ASP",1,0,"07",43.38690185546875,-70.71920013427734,238,58.2,,"25",43.39550018310547,-70.69999694824219,233,238.2,
 242510,21057,"KSFM",4999,100,"ASP",1,0,"14",43.400299072265625,-70.71430206298828,242,120,896,"32",43.393699645996094,-70.69779968261719,231,300,
@@ -41201,6 +41207,12 @@
 526228,526227,"US-8454",100,65,"Turf",0,0,"H1",,,,,,,,,,,
 526231,526230,"US-8455",54,54,"ASP",0,0,"H1",,,,,,,,,,,
 526241,526240,"US-8456",1500,100,"Turf",0,0,"18",,,,,,"36",,,,,
+526311,526310,"US-8458",40,40,"Turf",0,0,"H1",,,,,,,,,,,
+526315,526314,"US-8459",55,55,"CON",0,0,"H1",,,,,,,,,,,
+526336,526335,"US-8460",1900,60,"Turf",0,0,"1",,,,,,"19",,,,,
+526354,526353,"US-8461",65,65,"Mats",0,0,"H1",,,,,,,,,,,
+526360,526358,"US-8462",36,36,"ASP",1,0,"H1",,,,,,,,,,,
+526393,526391,"US-8463",30,30,"CON",0,0,"H1",,,,,,,,,,,
 270865,15357,"US-92N",78,78,"CONC-G",1,0,"H1",,,,,,,,,,,
 270929,15405,"US-93TX",50,50,"CONC",1,0,"H1",,,,,,"H1",,,,,
 256238,16876,"US-CO22",4000,75,"GRVL",0,0,"01",,,,,,"19",,,,,