diff --git a/hwy_data/ENG/gbna/eng.a0205.wpt b/hwy_data/ENG/gbna/eng.a0205.wpt
index 451e813a298..22c56cce2b8 100644
--- a/hwy_data/ENG/gbna/eng.a0205.wpt
+++ b/hwy_data/ENG/gbna/eng.a0205.wpt
@@ -24,7 +24,7 @@ A214/A3036 http://www.openstreetmap.org/?lat=51.458459&lon=-0.182133
 A217 http://www.openstreetmap.org/?lat=51.457764&lon=-0.191188
 A218/A3209 http://www.openstreetmap.org/?lat=51.457764&lon=-0.196488
 A3_S http://www.openstreetmap.org/?lat=51.456611&lon=-0.202778
-A308 http://www.openstreetmap.org/?lat=51.460799&lon=-0.217152
+A219 +A308 http://www.openstreetmap.org/?lat=51.460799&lon=-0.217152
 A306 http://www.openstreetmap.org/?lat=51.465237&lon=-0.243802
 B351 http://www.openstreetmap.org/?lat=51.464756&lon=-0.266676
 A305 http://www.openstreetmap.org/?lat=51.464302&lon=-0.276418
diff --git a/hwy_data/ENG/gbna/eng.a1307.wpt b/hwy_data/ENG/gbna/eng.a1307.wpt
index 61fbed2aed9..bfe9228bda0 100644
--- a/hwy_data/ENG/gbna/eng.a1307.wpt
+++ b/hwy_data/ENG/gbna/eng.a1307.wpt
@@ -20,7 +20,7 @@ DryDraRd http://www.openstreetmap.org/?lat=52.249290&lon=0.045125
 OakRd http://www.openstreetmap.org/?lat=52.245861&lon=0.039439
 A14(31) http://www.openstreetmap.org/?lat=52.230625&lon=0.070810
 GirRd http://www.openstreetmap.org/?lat=52.225729&lon=0.087075
-A1134_N +A1134_E http://www.openstreetmap.org/?lat=52.213964&lon=0.110604
+A1134_N http://www.openstreetmap.org/?lat=52.213964&lon=0.110604
 CasSt http://www.openstreetmap.org/?lat=52.213689&lon=0.111277
 A1303_W http://www.openstreetmap.org/?lat=52.210542&lon=0.110405
 A1303_E http://www.openstreetmap.org/?lat=52.210069&lon=0.111784
@@ -31,7 +31,7 @@ A603_E http://www.openstreetmap.org/?lat=52.199319&lon=0.127346
 StaRd http://www.openstreetmap.org/?lat=52.195064&lon=0.131278
 BroAve http://www.openstreetmap.org/?lat=52.192374&lon=0.133724
 CheHinRd http://www.openstreetmap.org/?lat=52.189329&lon=0.135934
-A1134_E +A1134 http://www.openstreetmap.org/?lat=52.178794&lon=0.142651
+A1134_E http://www.openstreetmap.org/?lat=52.178794&lon=0.142651
 FenRd http://www.openstreetmap.org/?lat=52.176504&lon=0.145118
 BabPR http://www.openstreetmap.org/?lat=52.167213&lon=0.157671
 HinWay http://www.openstreetmap.org/?lat=52.165752&lon=0.160782
diff --git a/hwy_data/ENG/gbna/eng.a6042.wpt b/hwy_data/ENG/gbna/eng.a6042.wpt
index cc05bf0504a..ba309144523 100644
--- a/hwy_data/ENG/gbna/eng.a6042.wpt
+++ b/hwy_data/ENG/gbna/eng.a6042.wpt
@@ -1,7 +1,7 @@
 A57 http://www.openstreetmap.org/?lat=53.475302&lon=-2.261682
 A6143 http://www.openstreetmap.org/?lat=53.476285&lon=-2.261467
 B5225 http://www.openstreetmap.org/?lat=53.478439&lon=-2.260487
-A34 http://www.openstreetmap.org/?lat=53.481585&lon=-2.256875
+IrwSt +A34 http://www.openstreetmap.org/?lat=53.481545&lon=-2.256762
 B5461 http://www.openstreetmap.org/?lat=53.482411&lon=-2.257633
 A6 http://www.openstreetmap.org/?lat=53.483298&lon=-2.257492
 A6041 http://www.openstreetmap.org/?lat=53.486794&lon=-2.253613
diff --git a/hwy_data/ENG/gbrrr/eng.leerr.wpt b/hwy_data/ENG/gbrrr/eng.leerr.wpt
index 189ca8b12bd..7301e9d3a02 100644
--- a/hwy_data/ENG/gbrrr/eng.leerr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.leerr.wpt
@@ -18,7 +18,7 @@ A660 http://www.openstreetmap.org/?lat=53.837842&lon=-1.593876
 A61 http://www.openstreetmap.org/?lat=53.848223&lon=-1.534395
 RouParkLn http://www.openstreetmap.org/?lat=53.848374&lon=-1.500450
 B6902 http://www.openstreetmap.org/?lat=53.842248&lon=-1.479206
-A58 http://www.openstreetmap.org/?lat=53.842830&lon=-1.467834
+A58_E +A58 http://www.openstreetmap.org/?lat=53.842830&lon=-1.467834
 SkeLn http://www.openstreetmap.org/?lat=53.839614&lon=-1.445979
 A64 http://www.openstreetmap.org/?lat=53.832068&lon=-1.440883
 LeeRd http://www.openstreetmap.org/?lat=53.818364&lon=-1.430111
diff --git a/hwy_data/ENG/gbrrr/eng.leior.wpt b/hwy_data/ENG/gbrrr/eng.leior.wpt
index f2d256624fa..1502ae578cd 100644
--- a/hwy_data/ENG/gbrrr/eng.leior.wpt
+++ b/hwy_data/ENG/gbrrr/eng.leior.wpt
@@ -6,7 +6,7 @@ A5630 http://www.openstreetmap.org/?lat=52.660194&lon=-1.171374
 BeaLeysLn http://www.openstreetmap.org/?lat=52.666988&lon=-1.152148
 A6_N http://www.openstreetmap.org/?lat=52.664464&lon=-1.129020
 A607 http://www.openstreetmap.org/?lat=52.667430&lon=-1.107817
-A6030 http://www.openstreetmap.org/?lat=52.657669&lon=-1.079493
+A6030_N +A6030 http://www.openstreetmap.org/?lat=52.657669&lon=-1.079493
 LowKeyLn http://www.openstreetmap.org/?lat=52.650146&lon=-1.070566
 A47/A563 http://www.openstreetmap.org/?lat=52.637647&lon=-1.073399
 A47/A6030 http://www.openstreetmap.org/?lat=52.642282&lon=-1.091809
diff --git a/hwy_data/ENG/gbrrr/eng.lonncir.wpt b/hwy_data/ENG/gbrrr/eng.lonncir.wpt
index 9c0c15c040b..42d41256e3e 100644
--- a/hwy_data/ENG/gbrrr/eng.lonncir.wpt
+++ b/hwy_data/ENG/gbrrr/eng.lonncir.wpt
@@ -33,7 +33,7 @@ M11 http://www.openstreetmap.org/?lat=51.593016&lon=0.037143
 A12 http://www.openstreetmap.org/?lat=51.576059&lon=0.044139
 A118 http://www.openstreetmap.org/?lat=51.556395&lon=0.065317
 A124 http://www.openstreetmap.org/?lat=51.536646&lon=0.069008
-A13 http://www.openstreetmap.org/?lat=51.525187&lon=0.073215
+A406/A1020 +A13 http://www.openstreetmap.org/?lat=51.525187&lon=0.073215
 FerSt http://www.openstreetmap.org/?lat=51.511260&lon=0.070875
 A117/A1020 http://www.openstreetmap.org/?lat=51.508035&lon=0.070338
 FisWay http://www.openstreetmap.org/?lat=51.501510&lon=0.070843
diff --git a/hwy_data/ENG/gbrrr/eng.lonrr.wpt b/hwy_data/ENG/gbrrr/eng.lonrr.wpt
index ec42182f74c..c4cdf374693 100644
--- a/hwy_data/ENG/gbrrr/eng.lonrr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.lonrr.wpt
@@ -36,9 +36,9 @@ A400 http://www.openstreetmap.org/?lat=51.525053&lon=-0.138155
 A4200 http://www.openstreetmap.org/?lat=51.527312&lon=-0.130785
 B504 http://www.openstreetmap.org/?lat=51.529158&lon=-0.126139
 A5202 http://www.openstreetmap.org/?lat=51.529929&lon=-0.124041
-A5200 http://www.openstreetmap.org/?lat=51.530773&lon=-0.121708
+A5200/A5203 +A5200 http://www.openstreetmap.org/?lat=51.530773&lon=-0.121708
 A201 http://www.openstreetmap.org/?lat=51.530106&lon=-0.118618
-A1_N http://www.openstreetmap.org/?lat=51.531916&lon=-0.106285
+A1/A401 +A1_N http://www.openstreetmap.org/?lat=51.531916&lon=-0.106285
 A1_S http://www.openstreetmap.org/?lat=51.530835&lon=-0.103196
 B144 http://www.openstreetmap.org/?lat=51.528210&lon=-0.091667
 A1200 http://www.openstreetmap.org/?lat=51.527282&lon=-0.088384
diff --git a/hwy_data/ENG/gbrrr/eng.lonscir.wpt b/hwy_data/ENG/gbrrr/eng.lonscir.wpt
index 454d6d0a134..d8c5ba0a58f 100644
--- a/hwy_data/ENG/gbrrr/eng.lonscir.wpt
+++ b/hwy_data/ENG/gbrrr/eng.lonscir.wpt
@@ -25,7 +25,7 @@ A214/A3036 http://www.openstreetmap.org/?lat=51.458459&lon=-0.182133
 A217 http://www.openstreetmap.org/?lat=51.457764&lon=-0.191188
 A218/A3209 http://www.openstreetmap.org/?lat=51.457764&lon=-0.196488
 A3_S http://www.openstreetmap.org/?lat=51.456611&lon=-0.202778
-A308 http://www.openstreetmap.org/?lat=51.460799&lon=-0.217152
+A219 +A308 http://www.openstreetmap.org/?lat=51.460799&lon=-0.217152
 A306 http://www.openstreetmap.org/?lat=51.465237&lon=-0.243802
 B351 http://www.openstreetmap.org/?lat=51.464756&lon=-0.266676
 A305 http://www.openstreetmap.org/?lat=51.464302&lon=-0.276418
@@ -33,4 +33,4 @@ A316 http://www.openstreetmap.org/?lat=51.469114&lon=-0.276804
 A307 http://www.openstreetmap.org/?lat=51.482719&lon=-0.286803
 A315_W http://www.openstreetmap.org/?lat=51.488892&lon=-0.287533
 A3000 http://www.openstreetmap.org/?lat=51.490122&lon=-0.285473
-A4 http://www.openstreetmap.org/?lat=51.491404&lon=-0.281954
+A4/A315 +A4 http://www.openstreetmap.org/?lat=51.491404&lon=-0.281954
diff --git a/hwy_data/ENG/gbrrr/eng.manrrinn.wpt b/hwy_data/ENG/gbrrr/eng.manrrinn.wpt
index 0fda179050e..2c1faaaae51 100644
--- a/hwy_data/ENG/gbrrr/eng.manrrinn.wpt
+++ b/hwy_data/ENG/gbrrr/eng.manrrinn.wpt
@@ -3,7 +3,7 @@ A56_S http://www.openstreetmap.org/?lat=53.471981&lon=-2.257519
 A57/A6042 http://www.openstreetmap.org/?lat=53.475302&lon=-2.261682
 A6143 http://www.openstreetmap.org/?lat=53.476285&lon=-2.261467
 B5225 http://www.openstreetmap.org/?lat=53.478439&lon=-2.260487
-A34_N http://www.openstreetmap.org/?lat=53.481585&lon=-2.256875
+IrwSt +A34_N http://www.openstreetmap.org/?lat=53.481545&lon=-2.256762
 B5461 http://www.openstreetmap.org/?lat=53.482411&lon=-2.257633
 A6_N http://www.openstreetmap.org/?lat=53.483298&lon=-2.257492
 A6041 http://www.openstreetmap.org/?lat=53.486794&lon=-2.253613
@@ -17,6 +17,6 @@ A662 http://www.openstreetmap.org/?lat=53.479440&lon=-2.222586
 A665_S http://www.openstreetmap.org/?lat=53.476321&lon=-2.217811
 A635_E http://www.openstreetmap.org/?lat=53.475388&lon=-2.219487
 A57M/A635 http://www.openstreetmap.org/?lat=53.473948&lon=-2.229881
-A34_S http://www.openstreetmap.org/?lat=53.472058&lon=-2.235246
+A34 +A34_S http://www.openstreetmap.org/?lat=53.472058&lon=-2.235246
 CamSt http://www.openstreetmap.org/?lat=53.470538&lon=-2.241962
 A5103_E http://www.openstreetmap.org/?lat=53.470436&lon=-2.246768
diff --git a/hwy_data/ENG/gbrrr/eng.nhtrr.wpt b/hwy_data/ENG/gbrrr/eng.nhtrr.wpt
index 11b8179579b..fdf382bdcc1 100644
--- a/hwy_data/ENG/gbrrr/eng.nhtrr.wpt
+++ b/hwy_data/ENG/gbrrr/eng.nhtrr.wpt
@@ -1,9 +1,9 @@
 A43/A5076 http://www.openstreetmap.org/?lat=52.276212&lon=-0.845469
 A4500_E http://www.openstreetmap.org/?lat=52.254269&lon=-0.835784
-A45_E http://www.openstreetmap.org/?lat=52.244988&lon=-0.836849
+A45/A5076 +A45_E http://www.openstreetmap.org/?lat=52.244988&lon=-0.836849
 A428 http://www.openstreetmap.org/?lat=52.230121&lon=-0.869323
 EagDr http://www.openstreetmap.org/?lat=52.221558&lon=-0.876068
-A45_W http://www.openstreetmap.org/?lat=52.214771&lon=-0.894316
+A43/A45 +A45_W http://www.openstreetmap.org/?lat=52.214771&lon=-0.894316
 A5123_N http://www.openstreetmap.org/?lat=52.216442&lon=-0.913153
 HunRd http://www.openstreetmap.org/?lat=52.224487&lon=-0.925941
 A5123_S http://www.openstreetmap.org/?lat=52.223015&lon=-0.937014
diff --git a/hwy_data/ESP-CT/espa/espct.c016.wpt b/hwy_data/ESP-CT/espa/espct.c016.wpt
index 40cc19e4b63..6fb140fd77b 100644
--- a/hwy_data/ESP-CT/espa/espct.c016.wpt
+++ b/hwy_data/ESP-CT/espa/espct.c016.wpt
@@ -49,4 +49,4 @@ B-40 http://www.openstreetmap.org/?lat=41.555433&lon=1.977046
 90 http://www.openstreetmap.org/?lat=42.047062&lon=1.876237
 92 http://www.openstreetmap.org/?lat=42.067423&lon=1.874800
 95 http://www.openstreetmap.org/?lat=42.090149&lon=1.854983
-C-26 +C-26_W +C26_W http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
+C-26 +C26_W http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
diff --git a/hwy_data/ESP-CT/espa/espct.c017vic.wpt b/hwy_data/ESP-CT/espa/espct.c017vic.wpt
index 2f788874e52..4f8f7bb9d35 100644
--- a/hwy_data/ESP-CT/espa/espct.c017vic.wpt
+++ b/hwy_data/ESP-CT/espa/espct.c017vic.wpt
@@ -11,9 +11,9 @@
 56 http://www.openstreetmap.org/?lat=41.903627&lon=2.247884
 57 http://www.openstreetmap.org/?lat=41.909751&lon=2.249236
 60 http://www.openstreetmap.org/?lat=41.927346&lon=2.230911
-C-25_W +C25_W http://www.openstreetmap.org/?lat=41.940978&lon=2.231169
+C-25_W http://www.openstreetmap.org/?lat=41.940978&lon=2.231169
 62 http://www.openstreetmap.org/?lat=41.951926&lon=2.236791
-C-25_E +C25_E http://www.openstreetmap.org/?lat=41.957224&lon=2.245631
+C-25_E http://www.openstreetmap.org/?lat=41.957224&lon=2.245631
 64 http://www.openstreetmap.org/?lat=41.962362&lon=2.248421
 65 http://www.openstreetmap.org/?lat=41.974647&lon=2.243743
 67 http://www.openstreetmap.org/?lat=41.987758&lon=2.242413
diff --git a/hwy_data/ESP-CT/espa/espct.ll011.wpt b/hwy_data/ESP-CT/espa/espct.ll011.wpt
index eb571f9d436..cb491470e96 100644
--- a/hwy_data/ESP-CT/espa/espct.ll011.wpt
+++ b/hwy_data/ESP-CT/espa/espct.ll011.wpt
@@ -1,10 +1,10 @@
 A-2 +A2 http://www.openstreetmap.org/?lat=41.631675&lon=0.751576
 N-II_E http://www.openstreetmap.org/?lat=41.628836&lon=0.747628
 LV-2003 +LV2003 http://www.openstreetmap.org/?lat=41.625917&lon=0.720076
-C-13B +C13 +C-13 http://www.openstreetmap.org/?lat=41.623623&lon=0.699391
+C-13B +C13 http://www.openstreetmap.org/?lat=41.623623&lon=0.699391
 CarD http://www.openstreetmap.org/?lat=41.620215&lon=0.679843
-N-240 +N240_E +N-240_E http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
-N-240a +N-240_W http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
+N-240 +N240_E http://www.openstreetmap.org/?lat=41.618137&lon=0.664823
+N-240a http://www.openstreetmap.org/?lat=41.614127&lon=0.651605
 AviGar http://www.openstreetmap.org/?lat=41.608576&lon=0.634847
 LL-12 +LL12 http://www.openstreetmap.org/?lat=41.603795&lon=0.624547
 N-II_W +NII_W http://www.openstreetmap.org/?lat=41.608351&lon=0.617273
diff --git a/hwy_data/ESP-CT/espct/espct.c013.wpt b/hwy_data/ESP-CT/espct/espct.c013.wpt
index 5e49fdf84e9..7624967e186 100644
--- a/hwy_data/ESP-CT/espct/espct.c013.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c013.wpt
@@ -1,8 +1,8 @@
-C13z +VilBar_N http://www.openstreetmap.org/?lat=41.708952&lon=0.753760
+C13z http://www.openstreetmap.org/?lat=41.708952&lon=0.753760
 CamiTer http://www.openstreetmap.org/?lat=41.749992&lon=0.804191
 C-26/53 http://www.openstreetmap.org/?lat=41.782993&lon=0.825562
 C-148a http://www.openstreetmap.org/?lat=41.786465&lon=0.827901
-C-26_E +C26_E http://www.openstreetmap.org/?lat=41.805870&lon=0.848007
+C-26_E http://www.openstreetmap.org/?lat=41.805870&lon=0.848007
 C-147_S http://www.openstreetmap.org/?lat=41.820615&lon=0.839725
 +X382230 http://www.openstreetmap.org/?lat=41.851534&lon=0.869551
 LV-9047 http://www.openstreetmap.org/?lat=41.869513&lon=0.870860
diff --git a/hwy_data/ESP-CT/espct/espct.c016ber.wpt b/hwy_data/ESP-CT/espct/espct.c016ber.wpt
index 2948d1af359..f112caf0798 100644
--- a/hwy_data/ESP-CT/espct/espct.c016ber.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c016ber.wpt
@@ -1,20 +1,20 @@
-C-26_W +C26_W split http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
-C-149b +C149b http://www.openstreetmap.org/?lat=42.109613&lon=1.858889
+C-26_W http://www.openstreetmap.org/?lat=42.095380&lon=1.854018
+C-149b http://www.openstreetmap.org/?lat=42.109613&lon=1.858889
 C-26_E http://www.openstreetmap.org/?lat=42.116402&lon=1.855896
 C-1411z_S http://www.openstreetmap.org/?lat=42.130662&lon=1.864189
-C-1411z_N +C1411z_N http://www.openstreetmap.org/?lat=42.142357&lon=1.864972
+C-1411z_N http://www.openstreetmap.org/?lat=42.142357&lon=1.864972
 CarBae http://www.openstreetmap.org/?lat=42.146116&lon=1.863245
 +X8 http://www.openstreetmap.org/?lat=42.165439&lon=1.855059
 +X8A http://www.openstreetmap.org/?lat=42.195969&lon=1.870852
 B-400 http://www.openstreetmap.org/?lat=42.217673&lon=1.869274
-C-1411a_S +C1411a_S http://www.openstreetmap.org/?lat=42.227906&lon=1.876436
+C-1411a_S http://www.openstreetmap.org/?lat=42.227906&lon=1.876436
 B-402 http://www.openstreetmap.org/?lat=42.230615&lon=1.882664
-C-1411a_N +C1411a_N http://www.openstreetmap.org/?lat=42.237001&lon=1.875937
+C-1411a_N http://www.openstreetmap.org/?lat=42.237001&lon=1.875937
 Baga http://www.openstreetmap.org/?lat=42.252426&lon=1.867333
 +X10 http://www.openstreetmap.org/?lat=42.262034&lon=1.852934
 +X11 http://www.openstreetmap.org/?lat=42.286389&lon=1.851046
 +X12 http://www.openstreetmap.org/?lat=42.294675&lon=1.863192
 CarUrus http://www.openstreetmap.org/?lat=42.344922&lon=1.833043
-C-162 +C162 http://www.openstreetmap.org/?lat=42.348792&lon=1.831305
+C-162 http://www.openstreetmap.org/?lat=42.348792&lon=1.831305
 +X705235 http://www.openstreetmap.org/?lat=42.349791&lon=1.815534
-N-260R +N260 http://www.openstreetmap.org/?lat=42.362952&lon=1.814075
+N-260R http://www.openstreetmap.org/?lat=42.362952&lon=1.814075
diff --git a/hwy_data/ESP-CT/espct/espct.c017.wpt b/hwy_data/ESP-CT/espct/espct.c017.wpt
index 5e07d2eb16e..b2e79427ae7 100644
--- a/hwy_data/ESP-CT/espct/espct.c017.wpt
+++ b/hwy_data/ESP-CT/espct/espct.c017.wpt
@@ -33,7 +33,7 @@ N-152z_FigS http://www.openstreetmap.org/?lat=41.717626&lon=2.272872
 N-152z_FigN http://www.openstreetmap.org/?lat=41.731173&lon=2.269771
 Tag http://www.openstreetmap.org/?lat=41.739617&lon=2.265544
 +X530645 http://www.openstreetmap.org/?lat=41.751529&lon=2.251124
-N-152z_AigS +CarRib_S http://www.openstreetmap.org/?lat=41.764238&lon=2.251639
+N-152z_AigS http://www.openstreetmap.org/?lat=41.764238&lon=2.251639
 +X893355 http://www.openstreetmap.org/?lat=41.772808&lon=2.245095
 N-152z_AigN http://www.openstreetmap.org/?lat=41.782225&lon=2.244902
 44 http://www.openstreetmap.org/?lat=41.795752&lon=2.234837
diff --git a/hwy_data/ITA-LOM/itass2/italom.ss009cod.wpt b/hwy_data/ITA-LOM/itass2/italom.ss009cod.wpt
index c1204b1feb0..421abe151be 100644
--- a/hwy_data/ITA-LOM/itass2/italom.ss009cod.wpt
+++ b/hwy_data/ITA-LOM/itass2/italom.ss009cod.wpt
@@ -6,5 +6,6 @@ A1 http://www.openstreetmap.org/?lat=45.105758&lon=9.684792
 ViaInd http://www.openstreetmap.org/?lat=45.113027&lon=9.687366
 SP591 http://www.openstreetmap.org/?lat=45.127562&lon=9.684780
 SP126 http://www.openstreetmap.org/?lat=45.150630&lon=9.670844
-SP234_E http://www.openstreetmap.org/?lat=45.164807&lon=9.661982
-Cod/Cas http://www.openstreetmap.org/?lat=45.168694&lon=9.659595
+SP234_E +Cod/Cas http://www.openstreetmap.org/?lat=45.163521&lon=9.659815
+SP142 http://www.openstreetmap.org/?lat=45.166146&lon=9.651597
+SP234 http://www.openstreetmap.org/?lat=45.176221&lon=9.631748
diff --git a/hwy_data/ITA-PIE/itass2/itapie.ss229.wpt b/hwy_data/ITA-PIE/itass2/itapie.ss229.wpt
index 0f12fe1f5ee..0d699bd1e2b 100644
--- a/hwy_data/ITA-PIE/itass2/itapie.ss229.wpt
+++ b/hwy_data/ITA-PIE/itass2/itapie.ss229.wpt
@@ -1,4 +1,4 @@
-SR229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
+SS703 +SR229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
 SP17 http://www.openstreetmap.org/?lat=45.573865&lon=8.555882
 SP22 http://www.openstreetmap.org/?lat=45.618653&lon=8.515842
 SP159 http://www.openstreetmap.org/?lat=45.630778&lon=8.505242
diff --git a/hwy_data/ITA-PIE/itass2/itapie.ss299.wpt b/hwy_data/ITA-PIE/itass2/itapie.ss299.wpt
index 5d9e4d8ab0b..763df7f9ab6 100644
--- a/hwy_data/ITA-PIE/itass2/itapie.ss299.wpt
+++ b/hwy_data/ITA-PIE/itass2/itapie.ss299.wpt
@@ -1,6 +1,7 @@
 ViaGioPer http://www.openstreetmap.org/?lat=45.455841&lon=8.599162
 ViaAdoBor http://www.openstreetmap.org/?lat=45.466075&lon=8.592339
 SS299Dir http://www.openstreetmap.org/?lat=45.477782&lon=8.581181
+SS703 http://www.openstreetmap.org/?lat=45.487898&lon=8.577189
 ViaNib http://www.openstreetmap.org/?lat=45.492585&lon=8.570366
 SP17 http://www.openstreetmap.org/?lat=45.528734&lon=8.505478
 SP299 http://www.openstreetmap.org/?lat=45.536964&lon=8.484471
diff --git a/hwy_data/ITA-PIE/itass2/itapie.ss703.wpt b/hwy_data/ITA-PIE/itass2/itapie.ss703.wpt
index 1c9caa978ff..512f851f0ce 100644
--- a/hwy_data/ITA-PIE/itass2/itapie.ss703.wpt
+++ b/hwy_data/ITA-PIE/itass2/itapie.ss703.wpt
@@ -1,3 +1,5 @@
+SS299 http://www.openstreetmap.org/?lat=45.487898&lon=8.577189
+SS229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
 SS32 http://www.openstreetmap.org/?lat=45.499459&lon=8.631778
 SP2 http://www.openstreetmap.org/?lat=45.481950&lon=8.644395
 ViaGioBia http://www.openstreetmap.org/?lat=45.465729&lon=8.656111
diff --git a/hwy_data/ITA/itass/ita.ss009cod.wpt b/hwy_data/ITA/itass/ita.ss009cod.wpt
index a27f70d9e14..a1228897ea8 100644
--- a/hwy_data/ITA/itass/ita.ss009cod.wpt
+++ b/hwy_data/ITA/itass/ita.ss009cod.wpt
@@ -7,5 +7,6 @@ A1 http://www.openstreetmap.org/?lat=45.105758&lon=9.684792
 ViaInd http://www.openstreetmap.org/?lat=45.113027&lon=9.687366
 SP591 http://www.openstreetmap.org/?lat=45.127562&lon=9.684780
 SP126 http://www.openstreetmap.org/?lat=45.150630&lon=9.670844
-SP234_E http://www.openstreetmap.org/?lat=45.164807&lon=9.661982
-Cod/Cas http://www.openstreetmap.org/?lat=45.168694&lon=9.659595
+SP234_E +Cod/Cas http://www.openstreetmap.org/?lat=45.163521&lon=9.659815
+SP142 http://www.openstreetmap.org/?lat=45.166146&lon=9.651597
+SP234 http://www.openstreetmap.org/?lat=45.176221&lon=9.631748
diff --git a/hwy_data/ITA/itass/ita.ss229.wpt b/hwy_data/ITA/itass/ita.ss229.wpt
index 0f12fe1f5ee..0d699bd1e2b 100644
--- a/hwy_data/ITA/itass/ita.ss229.wpt
+++ b/hwy_data/ITA/itass/ita.ss229.wpt
@@ -1,4 +1,4 @@
-SR229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
+SS703 +SR229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
 SP17 http://www.openstreetmap.org/?lat=45.573865&lon=8.555882
 SP22 http://www.openstreetmap.org/?lat=45.618653&lon=8.515842
 SP159 http://www.openstreetmap.org/?lat=45.630778&lon=8.505242
diff --git a/hwy_data/ITA/itass/ita.ss299.wpt b/hwy_data/ITA/itass/ita.ss299.wpt
index 5d9e4d8ab0b..763df7f9ab6 100644
--- a/hwy_data/ITA/itass/ita.ss299.wpt
+++ b/hwy_data/ITA/itass/ita.ss299.wpt
@@ -1,6 +1,7 @@
 ViaGioPer http://www.openstreetmap.org/?lat=45.455841&lon=8.599162
 ViaAdoBor http://www.openstreetmap.org/?lat=45.466075&lon=8.592339
 SS299Dir http://www.openstreetmap.org/?lat=45.477782&lon=8.581181
+SS703 http://www.openstreetmap.org/?lat=45.487898&lon=8.577189
 ViaNib http://www.openstreetmap.org/?lat=45.492585&lon=8.570366
 SP17 http://www.openstreetmap.org/?lat=45.528734&lon=8.505478
 SP299 http://www.openstreetmap.org/?lat=45.536964&lon=8.484471
diff --git a/hwy_data/ITA/itass/ita.ss703.wpt b/hwy_data/ITA/itass/ita.ss703.wpt
index 1c9caa978ff..512f851f0ce 100644
--- a/hwy_data/ITA/itass/ita.ss703.wpt
+++ b/hwy_data/ITA/itass/ita.ss703.wpt
@@ -1,3 +1,5 @@
+SS299 http://www.openstreetmap.org/?lat=45.487898&lon=8.577189
+SS229 http://www.openstreetmap.org/?lat=45.497489&lon=8.604269
 SS32 http://www.openstreetmap.org/?lat=45.499459&lon=8.631778
 SP2 http://www.openstreetmap.org/?lat=45.481950&lon=8.644395
 ViaGioBia http://www.openstreetmap.org/?lat=45.465729&lon=8.656111
diff --git a/hwy_data/NIR/gbrrr/nir.belir.wpt b/hwy_data/NIR/gbrrr/nir.belir.wpt
index 0be6fce1b3f..96d9e714637 100644
--- a/hwy_data/NIR/gbrrr/nir.belir.wpt
+++ b/hwy_data/NIR/gbrrr/nir.belir.wpt
@@ -2,7 +2,7 @@ A6_E http://www.openstreetmap.org/?lat=54.605464&lon=-5.932542
 B126 http://www.openstreetmap.org/?lat=54.605828&lon=-5.932058
 A2_W http://www.openstreetmap.org/?lat=54.604625&lon=-5.927467
 CorSt http://www.openstreetmap.org/?lat=54.602699&lon=-5.925310
-A2_E http://www.openstreetmap.org/?lat=54.600691&lon=-5.923251
+A2/A501 +A2_E http://www.openstreetmap.org/?lat=54.600691&lon=-5.923251
 A11/A510_E http://www.openstreetmap.org/?lat=54.596987&lon=-5.922672
 A1/A6 http://www.openstreetmap.org/?lat=54.596664&lon=-5.929999
 A11/A510_W http://www.openstreetmap.org/?lat=54.596477&lon=-5.934677
diff --git a/hwy_data/NIR/gbrrr/nir.belor.wpt b/hwy_data/NIR/gbrrr/nir.belor.wpt
index b0dc12cdf97..37ced7fe297 100644
--- a/hwy_data/NIR/gbrrr/nir.belor.wpt
+++ b/hwy_data/NIR/gbrrr/nir.belor.wpt
@@ -8,7 +8,7 @@ B205 http://www.openstreetmap.org/?lat=54.546480&lon=-5.932274
 B23_S http://www.openstreetmap.org/?lat=54.552170&lon=-5.952068
 B103 http://www.openstreetmap.org/?lat=54.558253&lon=-5.955867
 B23_N http://www.openstreetmap.org/?lat=54.563388&lon=-5.951967
-A1 http://www.openstreetmap.org/?lat=54.568715&lon=-5.966837
+A1 http://www.openstreetmap.org/?lat=54.568964&lon=-5.967417
 M1 http://www.openstreetmap.org/?lat=54.573277&lon=-5.977448
 B102 http://www.openstreetmap.org/?lat=54.577267&lon=-5.980071
 A501 http://www.openstreetmap.org/?lat=54.581589&lon=-5.988493
diff --git a/hwy_data/NIR/nira/nir.a055.wpt b/hwy_data/NIR/nira/nir.a055.wpt
index 46d3e46e44e..e90d458ae11 100644
--- a/hwy_data/NIR/nira/nir.a055.wpt
+++ b/hwy_data/NIR/nira/nir.a055.wpt
@@ -8,7 +8,7 @@ B38_W http://www.openstreetmap.org/?lat=54.589792&lon=-5.996910
 A501 http://www.openstreetmap.org/?lat=54.581589&lon=-5.988493
 B102 http://www.openstreetmap.org/?lat=54.577267&lon=-5.980071
 M1 http://www.openstreetmap.org/?lat=54.573277&lon=-5.977448
-A1 http://www.openstreetmap.org/?lat=54.568715&lon=-5.966837
+A1 http://www.openstreetmap.org/?lat=54.568964&lon=-5.967417
 B23_N http://www.openstreetmap.org/?lat=54.563388&lon=-5.951967
 B103 http://www.openstreetmap.org/?lat=54.558253&lon=-5.955867
 B23_S http://www.openstreetmap.org/?lat=54.552170&lon=-5.952068
diff --git a/hwy_data/OK/usaib/ok.i040blelr.wpt b/hwy_data/OK/usaib/ok.i040blelr.wpt
index 61b94ca8a4d..224cc02be4a 100644
--- a/hwy_data/OK/usaib/ok.i040blelr.wpt
+++ b/hwy_data/OK/usaib/ok.i040blelr.wpt
@@ -2,7 +2,9 @@ I-40_W http://www.openstreetmap.org/?lat=35.529537&lon=-98.043709
 E1020 http://www.openstreetmap.org/?lat=35.536290&lon=-98.033216
 RefRd http://www.openstreetmap.org/?lat=35.537150&lon=-97.990022
 CouClubRd http://www.openstreetmap.org/?lat=35.532296&lon=-97.972383
-US81_N http://www.openstreetmap.org/?lat=35.532402&lon=-97.955002
+US81_N http://www.openstreetmap.org/?lat=35.532279&lon=-97.954936
+WadeSt_W http://www.openstreetmap.org/?lat=35.531394&lon=-97.954925
+WadeSt_E http://www.openstreetmap.org/?lat=35.531384&lon=-97.952675
 ElmSt http://www.openstreetmap.org/?lat=35.522377&lon=-97.952644
 27thSt http://www.openstreetmap.org/?lat=35.507984&lon=-97.940842
 OK66 http://www.openstreetmap.org/?lat=35.508011&lon=-97.937150
diff --git a/hwy_data/OK/usaok/ok.ok066.wpt b/hwy_data/OK/usaok/ok.ok066.wpt
index 40f6e635842..4d199991a3e 100644
--- a/hwy_data/OK/usaok/ok.ok066.wpt
+++ b/hwy_data/OK/usaok/ok.ok066.wpt
@@ -59,6 +59,7 @@ N3580 http://www.openstreetmap.org/?lat=35.762463&lon=-96.627052
 E0860 http://www.openstreetmap.org/?lat=35.770054&lon=-96.583042
 513thAve http://www.openstreetmap.org/?lat=35.787950&lon=-96.565790
 LaddAve http://www.openstreetmap.org/?lat=35.806363&lon=-96.509850
+FlyAve http://www.openstreetmap.org/?lat=35.806424&lon=-96.503563
 369thAve http://www.openstreetmap.org/?lat=35.821885&lon=-96.405115
 RolSt http://www.openstreetmap.org/?lat=35.830679&lon=-96.399922
 OK16_E http://www.openstreetmap.org/?lat=35.830800&lon=-96.391060
diff --git a/hwy_data/OK/usaus/ok.us081.wpt b/hwy_data/OK/usaus/ok.us081.wpt
index a91b11e7bd3..5fe6c660b23 100644
--- a/hwy_data/OK/usaus/ok.us081.wpt
+++ b/hwy_data/OK/usaus/ok.us081.wpt
@@ -42,7 +42,9 @@ I-40 http://www.openstreetmap.org/?lat=35.500998&lon=-97.936678
 OK66 http://www.openstreetmap.org/?lat=35.508011&lon=-97.937150
 27thSt http://www.openstreetmap.org/?lat=35.507984&lon=-97.940842
 ElmSt http://www.openstreetmap.org/?lat=35.522377&lon=-97.952644
-I-40BL_W http://www.openstreetmap.org/?lat=35.532402&lon=-97.955002
+WadeSt_E http://www.openstreetmap.org/?lat=35.531384&lon=-97.952675
+WadeSt_W http://www.openstreetmap.org/?lat=35.531394&lon=-97.954925
+I-40BL_W http://www.openstreetmap.org/?lat=35.532279&lon=-97.954936
 BriRd http://www.openstreetmap.org/?lat=35.565831&lon=-97.958651
 OK3_E http://www.openstreetmap.org/?lat=35.694292&lon=-97.959015
 OklAve http://www.openstreetmap.org/?lat=35.725776&lon=-97.976782
diff --git a/hwy_data/OK/usaush/ok.us066his.wpt b/hwy_data/OK/usaush/ok.us066his.wpt
index 487b90b3065..0d1b6010a14 100644
--- a/hwy_data/OK/usaush/ok.us066his.wpt
+++ b/hwy_data/OK/usaush/ok.us066his.wpt
@@ -33,7 +33,9 @@ US270 http://www.openstreetmap.org/?lat=35.536906&lon=-98.114219
 I-40BL_ERW +I-40BL_W http://www.openstreetmap.org/?lat=35.536290&lon=-98.033216
 RefRd http://www.openstreetmap.org/?lat=35.537150&lon=-97.990022
 CouClubRd http://www.openstreetmap.org/?lat=35.532296&lon=-97.972383
-US81_N http://www.openstreetmap.org/?lat=35.532402&lon=-97.955002
+US81_N http://www.openstreetmap.org/?lat=35.532279&lon=-97.954936
+WadeSt_W http://www.openstreetmap.org/?lat=35.531394&lon=-97.954925
+WadeSt_E http://www.openstreetmap.org/?lat=35.531384&lon=-97.952675
 ElmSt http://www.openstreetmap.org/?lat=35.522377&lon=-97.952644
 27thSt http://www.openstreetmap.org/?lat=35.507984&lon=-97.940842
 US81_S http://www.openstreetmap.org/?lat=35.508011&lon=-97.937150
@@ -109,6 +111,7 @@ N3580 http://www.openstreetmap.org/?lat=35.762463&lon=-96.627052
 E0860 http://www.openstreetmap.org/?lat=35.770054&lon=-96.583042
 513thAve http://www.openstreetmap.org/?lat=35.787950&lon=-96.565790
 LaddAve http://www.openstreetmap.org/?lat=35.806363&lon=-96.509850
+FlyAve http://www.openstreetmap.org/?lat=35.806424&lon=-96.503563
 369thAve http://www.openstreetmap.org/?lat=35.821885&lon=-96.405115
 RolSt http://www.openstreetmap.org/?lat=35.830679&lon=-96.399922
 OK16_E http://www.openstreetmap.org/?lat=35.830800&lon=-96.391060
diff --git a/hwy_data/OK/usaush/ok.us066hisdep.wpt b/hwy_data/OK/usaush/ok.us066hisdep.wpt
new file mode 100644
index 00000000000..9a7adeeadf8
--- /dev/null
+++ b/hwy_data/OK/usaush/ok.us066hisdep.wpt
@@ -0,0 +1,4 @@
+US66His_W http://www.openstreetmap.org/?lat=35.806363&lon=-96.509850
+LeddAve_S http://www.openstreetmap.org/?lat=35.802944&lon=-96.509807
+FlyAve_S http://www.openstreetmap.org/?lat=35.802909&lon=-96.503756
+US66His_E http://www.openstreetmap.org/?lat=35.806424&lon=-96.503563
diff --git a/hwy_data/OK/usaush/ok.us066hisren.wpt b/hwy_data/OK/usaush/ok.us066hisren.wpt
new file mode 100644
index 00000000000..c1a5bcf3282
--- /dev/null
+++ b/hwy_data/OK/usaush/ok.us066hisren.wpt
@@ -0,0 +1,5 @@
+US66His_W http://www.openstreetmap.org/?lat=35.531384&lon=-97.952675
+WadeSt_E http://www.openstreetmap.org/?lat=35.531392&lon=-97.949349
+ElmSt_W http://www.openstreetmap.org/?lat=35.522368&lon=-97.949338
+ElmSt_E http://www.openstreetmap.org/?lat=35.522421&lon=-97.937171
+US66His_E http://www.openstreetmap.org/?lat=35.508011&lon=-97.937150
diff --git a/hwy_data/POL/deleted/pol.olddk065.wpt b/hwy_data/POL/deleted/pol.olddk065.wpt
new file mode 100644
index 00000000000..1d025959f3d
--- /dev/null
+++ b/hwy_data/POL/deleted/pol.olddk065.wpt
@@ -0,0 +1,5 @@
+DK8_W http://www.openstreetmap.org/?lat=53.153308&lon=23.077383
+UliDob http://www.openstreetmap.org/?lat=53.167678&lon=23.062706
+FasKol http://www.openstreetmap.org/?lat=53.176900&lon=23.027687
+UliKos http://www.openstreetmap.org/?lat=53.198321&lon=23.022194
+DK65 http://www.openstreetmap.org/?lat=53.229147&lon=23.011551
diff --git a/hwy_data/POL/poldk/pol.dk008.wpt b/hwy_data/POL/poldk/pol.dk008.wpt
index 0cc5f30d2f8..a2a15a1347a 100644
--- a/hwy_data/POL/poldk/pol.dk008.wpt
+++ b/hwy_data/POL/poldk/pol.dk008.wpt
@@ -1,9 +1,9 @@
-S8 +UliNie http://www.openstreetmap.org/?lat=53.153816&lon=23.029468
+S8 +UliNie http://www.openstreetmap.org/?lat=53.154826&lon=23.023739
 UliKwi http://www.openstreetmap.org/?lat=53.151516&lon=23.042375
 UliWie http://www.openstreetmap.org/?lat=53.149540&lon=23.053340
 DW676 http://www.openstreetmap.org/?lat=53.148977&lon=23.058532
 UliEsp http://www.openstreetmap.org/?lat=53.151432&lon=23.070849
-DK65_N http://www.openstreetmap.org/?lat=53.153308&lon=23.077383
+DW669  +DK65_N http://www.openstreetmap.org/?lat=53.153308&lon=23.077383
 UliHugoKol http://www.openstreetmap.org/?lat=53.155788&lon=23.086567
 UliPro http://www.openstreetmap.org/?lat=53.158866&lon=23.096668
 UliLod http://www.openstreetmap.org/?lat=53.159384&lon=23.123249
diff --git a/hwy_data/POL/poldk/pol.dk065.wpt b/hwy_data/POL/poldk/pol.dk065.wpt
index d42e910e50f..fabdc843fca 100644
--- a/hwy_data/POL/poldk/pol.dk065.wpt
+++ b/hwy_data/POL/poldk/pol.dk065.wpt
@@ -16,11 +16,16 @@ UliSwi http://www.openstreetmap.org/?lat=53.159477&lon=23.141327
 UliLod http://www.openstreetmap.org/?lat=53.159384&lon=23.123249
 UliPro http://www.openstreetmap.org/?lat=53.158866&lon=23.096668
 UliHugoKol http://www.openstreetmap.org/?lat=53.155788&lon=23.086567
-DK8_W http://www.openstreetmap.org/?lat=53.153308&lon=23.077383
-UliDob http://www.openstreetmap.org/?lat=53.167678&lon=23.062706
-FasKol http://www.openstreetmap.org/?lat=53.176900&lon=23.027687
-UliKos http://www.openstreetmap.org/?lat=53.198321&lon=23.022194
-+X380932 http://www.openstreetmap.org/?lat=53.222788&lon=23.017302
+DW669 +DK8_W http://www.openstreetmap.org/?lat=53.153308&lon=23.077383
+UliEsp http://www.openstreetmap.org/?lat=53.151432&lon=23.070849
+DW676 http://www.openstreetmap.org/?lat=53.148977&lon=23.058532
+UliWie http://www.openstreetmap.org/?lat=53.149540&lon=23.053340
+UliKwi http://www.openstreetmap.org/?lat=53.151516&lon=23.042375
+S8 http://www.openstreetmap.org/?lat=53.154826&lon=23.023739
++X158484 http://www.openstreetmap.org/?lat=53.179099&lon=23.033352
++S16/S19 http://www.openstreetmap.org/?lat=53.200557&lon=23.034897
++X537252 http://www.openstreetmap.org/?lat=53.216184&lon=23.034554
+UliStu http://www.openstreetmap.org/?lat=53.229147&lon=23.011551
 Kos http://www.openstreetmap.org/?lat=53.244365&lon=22.994878
 DW671 http://www.openstreetmap.org/?lat=53.308827&lon=22.913532
 +X327683 http://www.openstreetmap.org/?lat=53.331129&lon=22.884865
diff --git a/hwy_data/POL/pols/pol.s008.wpt b/hwy_data/POL/pols/pol.s008.wpt
index 401d3180679..5174ccc96d2 100644
--- a/hwy_data/POL/pols/pol.s008.wpt
+++ b/hwy_data/POL/pols/pol.s008.wpt
@@ -149,4 +149,4 @@ R1 http://www.openstreetmap.org/?lat=52.307377&lon=21.092291
 91 http://www.openstreetmap.org/?lat=53.155083&lon=22.865338
 92 http://www.openstreetmap.org/?lat=53.164295&lon=22.945161
 93 http://www.openstreetmap.org/?lat=53.159561&lon=22.996445
-DK8 +DW676 http://www.openstreetmap.org/?lat=53.153816&lon=23.029468
+DK8/65 +DW676 +DK8 http://www.openstreetmap.org/?lat=53.154826&lon=23.023739
diff --git a/hwy_data/SCT/eure/sct.e15.wpt b/hwy_data/SCT/eure/sct.e15.wpt
index d4bc2ead8c2..406ed765895 100644
--- a/hwy_data/SCT/eure/sct.e15.wpt
+++ b/hwy_data/SCT/eure/sct.e15.wpt
@@ -105,7 +105,7 @@ A702 http://www.openstreetmap.org/?lat=55.895772&lon=-3.202564
 A701 http://www.openstreetmap.org/?lat=55.889870&lon=-3.162249
 LasRd http://www.openstreetmap.org/?lat=55.892918&lon=-3.133157
 A772 http://www.openstreetmap.org/?lat=55.898850&lon=-3.112300
-A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
+A7/A6106 +A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
 A68 http://www.openstreetmap.org/?lat=55.913812&lon=-3.065443
 A1/A720 http://www.openstreetmap.org/?lat=55.924743&lon=-3.059670
 A6094 http://www.openstreetmap.org/?lat=55.928793&lon=-3.021240
diff --git a/hwy_data/SCT/gbna/sct.a0720.wpt b/hwy_data/SCT/gbna/sct.a0720.wpt
index d56c9fe57a3..25ef13c5c84 100644
--- a/hwy_data/SCT/gbna/sct.a0720.wpt
+++ b/hwy_data/SCT/gbna/sct.a0720.wpt
@@ -1,6 +1,6 @@
 A1 http://www.openstreetmap.org/?lat=55.924743&lon=-3.059670
 A68 http://www.openstreetmap.org/?lat=55.913812&lon=-3.065443
-A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
+A7/A6106 +A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
 A772 http://www.openstreetmap.org/?lat=55.898850&lon=-3.112300
 LasRd http://www.openstreetmap.org/?lat=55.892918&lon=-3.133157
 A701 http://www.openstreetmap.org/?lat=55.889870&lon=-3.162249
diff --git a/hwy_data/SCT/gbna/sct.a0929.wpt b/hwy_data/SCT/gbna/sct.a0929.wpt
index e5125808d12..4bca714a38d 100644
--- a/hwy_data/SCT/gbna/sct.a0929.wpt
+++ b/hwy_data/SCT/gbna/sct.a0929.wpt
@@ -1,4 +1,4 @@
-A991 http://www.openstreetmap.org/?lat=56.464435&lon=-2.973132
+A991 http://www.openstreetmap.org/?lat=56.464452&lon=-2.973025
 Mea http://www.openstreetmap.org/?lat=56.464363&lon=-2.971480
 B959 http://www.openstreetmap.org/?lat=56.467410&lon=-2.963208
 B960 http://www.openstreetmap.org/?lat=56.468666&lon=-2.963337
diff --git a/hwy_data/SCT/gbna/sct.a0991.wpt b/hwy_data/SCT/gbna/sct.a0991.wpt
index 45fe1b3a0cf..ed11848d32d 100644
--- a/hwy_data/SCT/gbna/sct.a0991.wpt
+++ b/hwy_data/SCT/gbna/sct.a0991.wpt
@@ -1,6 +1,7 @@
 A92_N http://www.openstreetmap.org/?lat=56.462668&lon=-2.962639
-A929_E http://www.openstreetmap.org/?lat=56.464103&lon=-2.964292
-A929_W http://www.openstreetmap.org/?lat=56.464435&lon=-2.973132
+Bla +A929_E http://www.openstreetmap.org/?lat=56.464103&lon=-2.964292
++X816175 http://www.openstreetmap.org/?lat=56.465101&lon=-2.968669
+A929 +A929_W http://www.openstreetmap.org/?lat=56.464452&lon=-2.973025
 A923 http://www.openstreetmap.org/?lat=56.463723&lon=-2.979569
 CanLn http://www.openstreetmap.org/?lat=56.459740&lon=-2.977552
 A85 http://www.openstreetmap.org/?lat=56.458602&lon=-2.968369
diff --git a/hwy_data/SCT/gbrrr/sct.dunrr.wpt b/hwy_data/SCT/gbrrr/sct.dunrr.wpt
index 5ed6099e493..ddae049d75a 100644
--- a/hwy_data/SCT/gbrrr/sct.dunrr.wpt
+++ b/hwy_data/SCT/gbrrr/sct.dunrr.wpt
@@ -1,6 +1,7 @@
 A923_E http://www.openstreetmap.org/?lat=56.463723&lon=-2.979569
-A929_W http://www.openstreetmap.org/?lat=56.464435&lon=-2.973132
-A929_E http://www.openstreetmap.org/?lat=56.464103&lon=-2.964292
+A929 +A929_W http://www.openstreetmap.org/?lat=56.464452&lon=-2.973025
++X816175 http://www.openstreetmap.org/?lat=56.465101&lon=-2.968669
+Bla +A929_E http://www.openstreetmap.org/?lat=56.464103&lon=-2.964292
 A92_N http://www.openstreetmap.org/?lat=56.462668&lon=-2.962639
 A92_S http://www.openstreetmap.org/?lat=56.460001&lon=-2.965043
 A85 http://www.openstreetmap.org/?lat=56.458602&lon=-2.968369
diff --git a/hwy_data/SCT/gbrrr/sct.edicb.wpt b/hwy_data/SCT/gbrrr/sct.edicb.wpt
index befe41be844..8a520ee13de 100644
--- a/hwy_data/SCT/gbrrr/sct.edicb.wpt
+++ b/hwy_data/SCT/gbrrr/sct.edicb.wpt
@@ -1,7 +1,7 @@
 B6415 http://www.openstreetmap.org/?lat=55.926846&lon=-3.063641
 A1 http://www.openstreetmap.org/?lat=55.924743&lon=-3.059670
 A68 http://www.openstreetmap.org/?lat=55.913812&lon=-3.065443
-A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
+A7/A6106 +A7 http://www.openstreetmap.org/?lat=55.900375&lon=-3.092512
 A772 http://www.openstreetmap.org/?lat=55.898850&lon=-3.112300
 LasRd http://www.openstreetmap.org/?lat=55.892918&lon=-3.133157
 A701 http://www.openstreetmap.org/?lat=55.889870&lon=-3.162249
diff --git a/hwy_data/_systems/ausm.csv b/hwy_data/_systems/ausm.csv
index 25f815a3cb2..b46354fdcb0 100644
--- a/hwy_data/_systems/ausm.csv
+++ b/hwy_data/_systems/ausm.csv
@@ -42,4 +42,4 @@ ausm;AUS-VIC;M39;;;;ausvic.m039;
 ausm;AUS-VIC;M79;;;;ausvic.m079;
 ausm;AUS-VIC;M80;;;;ausvic.m080;
 ausm;AUS-VIC;M420;;;;ausvic.m420;
-ausm;AUS-VIC;M780;;;;ausvic.m780;M420Hal
+ausm;AUS-VIC;M780;;;;ausvic.m780;
diff --git a/hwy_data/_systems/espa.csv b/hwy_data/_systems/espa.csv
index b12b4a0b060..15b204d10c1 100644
--- a/hwy_data/_systems/espa.csv
+++ b/hwy_data/_systems/espa.csv
@@ -210,7 +210,7 @@ espa;ESP-CT;B-40;;;Terrassa;espct.b040;B40
 espa;ESP-CT;B-40;;Roc;La Roca de Valles;espct.b040roc;B40Roc
 espa;ESP-CL;BU-11;;;;espcl.bu011;BU11
 espa;ESP-CL;BU-30;;;;espcl.bu030;BU30
-espa;ESP-CT;C-13;;Lle;Lleida;espct.c013lle;C13x
+espa;ESP-CT;C-13;;Lle;Lleida;espct.c013lle;
 espa;ESP-CT;C-13;;Vil;Vilanova de la Barca;espct.c013vil;
 espa;ESP-CT;C-13B;;;;espct.c013b;C13B
 espa;ESP-CT;C-15;;Vil;Vilanova i la Geltru;espct.c015vil;
diff --git a/hwy_data/_systems/espct.csv b/hwy_data/_systems/espct.csv
index 2c9add91f81..4af285aca3a 100644
--- a/hwy_data/_systems/espct.csv
+++ b/hwy_data/_systems/espct.csv
@@ -6,7 +6,7 @@ espct;ESP-CT;C-12F;;;;espct.c012f;
 espct;ESP-CT;C-13;;Alc;Alcotge;espct.c013alc;
 espct;ESP-CT;C-13;;;Tremp;espct.c013;C13
 espct;ESP-CT;C-14;;;;espct.c014;C14x,C14
-espct;ESP-CT;C-15;;;Vallbona d'Anoia;espct.c015;C15
+espct;ESP-CT;C-15;;;Vallbona d'Anoia;espct.c015;
 espct;ESP-CT;C-15B;;;;espct.c015b;
 espct;ESP-CT;C-16;;Ber;Berga;espct.c016ber;
 espct;ESP-CT;C-16C;;;;espct.c016c;
diff --git a/hwy_data/_systems/espn.csv b/hwy_data/_systems/espn.csv
index d56660011d5..826dec4ecba 100644
--- a/hwy_data/_systems/espn.csv
+++ b/hwy_data/_systems/espn.csv
@@ -293,7 +293,7 @@ espn;ESP-VC;N-332r;;;;espvc.n332r;N332r
 espn;ESP-VC;N-337;;;;espvc.n337;N337
 espn;ESP-VC;N-337a;;;;espvc.n337a;
 espn;ESP-VC;N-338;;;;espvc.n338;N338
-espn;ESP-AN;N-339;;;;espan.n339;N339
+espn;ESP-AN;N-339;;;;espan.n339;
 espn;ESP-AN;N-340;;Chi;Chiclana de la Frontera;espan.n340chi;N340Chi
 espn;ESP-AN;N-340;;;Motril;espan.n340;N340
 espn;ESP-AN;N-340;;Poz;El Pozuelo;espan.n340poz;
@@ -406,7 +406,7 @@ espn;ESP-EX;N-435;;;;espex.n435;
 espn;ESP-AN;N-435;;;;espan.n435;N435
 espn;ESP-EX;N-435a;;;Capote;espex.n435a;
 espn;ESP-AN;N-435a;;;Trigueros;espan.n435a;
-espn;ESP-AN;N-437;;;;espan.n437;N437
+espn;ESP-AN;N-437;;;;espan.n437;
 espn;ESP-AN;N-442;;;;espan.n442;
 espn;ESP-AN;N-444;;;;espan.n444;
 espn;ESP-AN;N-445;;;;espan.n445;
diff --git a/hwy_data/_systems/usasib.csv b/hwy_data/_systems/usasib.csv
index 2ebb8322814..fe7d460de69 100644
--- a/hwy_data/_systems/usasib.csv
+++ b/hwy_data/_systems/usasib.csv
@@ -16,14 +16,14 @@ usasib;VT;CorWinBri;;;Cornish–Windsor Covered Bridge;vt.corwinbri;
 usasib;NH;CorWinBri;;;Cornish–Windsor Covered Bridge;nh.corwinbri;
 usasib;MO;EadBri;;;Eads Bridge;mo.eadbri;
 usasib;IL;EadBri;;;Eads Bridge;il.eadbri;
-usasib;WV;EHunBri;;;East Huntingdon Bridge;wv.ehunbri;
-usasib;OH;EHunBri;;;East Huntingdon Bridge;oh.ehunbri;
+usasib;WV;EHunBri;;;East Huntington Bridge;wv.ehunbri;
+usasib;OH;EHunBri;;;East Huntington Bridge;oh.ehunbri;
 usasib;VT;FraRdBri;;;Frazier Road Bridge;vt.frardbri;
 usasib;NH;FraRdBri;;;Frazier Road Bridge;nh.frardbri;
 usasib;VT;GuiBri;;;Guildhall Bridge;vt.guibri;
 usasib;NH;GuiBri;;;Guildhall Bridge;nh.guibri;
-usasib;WV;CarBri;;;Hi Carpender Memorial Bridge;wv.carbri;
-usasib;OH;CarBri;;;Hi Carpender Memorial Bridge;oh.carbri;
+usasib;WV;CarBri;;;Hi Carpenter Memorial Bridge;wv.carbri;
+usasib;OH;CarBri;;;Hi Carpenter Memorial Bridge;oh.carbri;
 usasib;OR;HooRivBri;;;Hood River Bridge;or.hoorivbri;
 usasib;WA;HooRivBri;;;Hood River Bridge;wa.hoorivbri;
 usasib;VT;JanPeaBri;;;Janice Peaslee Bridge;vt.janpeabri;
diff --git a/hwy_data/_systems/usasib_con.csv b/hwy_data/_systems/usasib_con.csv
index bfe38d9bb47..6d3d1ae3186 100644
--- a/hwy_data/_systems/usasib_con.csv
+++ b/hwy_data/_systems/usasib_con.csv
@@ -8,10 +8,10 @@ usasib;CBSBri;;Centre Bridge-Stockton Bridge;pa.cbsbri,nj.cbsbri
 usasib;CocDamBri;;Cochecton-Damascus Bridge;pa.cocdambri,ny.cocdambri
 usasib;CorWinBri;;Cornish–Windsor Covered Bridge;vt.corwinbri,nh.corwinbri
 usasib;EadBri;;Eads Bridge;mo.eadbri,il.eadbri
-usasib;EHunBri;;East Huntingdon Bridge;wv.ehunbri,oh.ehunbri
+usasib;EHunBri;;East Huntington Bridge;wv.ehunbri,oh.ehunbri
 usasib;FraRdBri;;Frazier Road Bridge;vt.frardbri,nh.frardbri
 usasib;GuiBri;;Guildhall Bridge;vt.guibri,nh.guibri
-usasib;CarBri;;Hi Carpender Memorial Bridge;wv.carbri,oh.carbri
+usasib;CarBri;;Hi Carpenter Memorial Bridge;wv.carbri,oh.carbri
 usasib;HooRivBri;;Hood River Bridge;or.hoorivbri,wa.hoorivbri
 usasib;JanPeaBri;;Janice Peaslee Bridge;vt.janpeabri,nh.janpeabri
 usasib;RoeSusBri;;John A Roebling Suspension Bridge;ky.roesusbri,oh.roesusbri
diff --git a/hwy_data/_systems/usaush.csv b/hwy_data/_systems/usaush.csv
index bdbb5698698..5b524bfc09a 100644
--- a/hwy_data/_systems/usaush.csv
+++ b/hwy_data/_systems/usaush.csv
@@ -85,6 +85,7 @@ usaush;OK;US66;His;WCl;(West) Clinton;ok.us066hiswcl;
 usaush;OK;US66;His;SCl;(South) Clinton;ok.us066hisscl;
 usaush;OK;US66;His;SWe;(South) Weatherford;ok.us066hisswe;
 usaush;OK;US66;His;Gea;Geary;ok.us066hisgea;
+usaush;OK;US66;His;Ren;(1926-1932 Original Alignment) El Reno;ok.us066hisren;
 usaush;OK;US66;His;Lak;(1958 Alignment) Lake Overholser;ok.us066hislak;
 usaush;OK;US66;His;Cre;(1933 Alignment) Crestwood;ok.us066hiscre;
 usaush;OK;US66;His;Bel;(1947 Beltline) Belle Isle;ok.us066hisbel;
@@ -92,6 +93,7 @@ usaush;OK;US66;His;Upt;(1930 Alignment) Uptown Oklahoma City;ok.us066hisupt;
 usaush;OK;US66;His;Hel;(1936 Beltline) Helm Farm;ok.us066hishel;
 usaush;OK;US66;His;Bri;(1931 Beltline) Britton;ok.us066hisbri;
 usaush;OK;US66;His;Cen;(Lincoln Blvd 1959) Central Park;ok.us066hiscen;
+usaush;OK;US66;His;Dep;(1926-1928) Depew;ok.us066hisdep;
 usaush;OK;US66;His;NTu;(1926-1932) Tulsa;ok.us066hisntu;
 usaush;OK;US66;His;Foy;Foyil;ok.us066hisfoy;
 usaush;OK;US66;His;Mia;Miami;ok.us066hismia;
diff --git a/hwy_data/_systems/usaush_con.csv b/hwy_data/_systems/usaush_con.csv
index 5eee7f0bffc..17db8462979 100644
--- a/hwy_data/_systems/usaush_con.csv
+++ b/hwy_data/_systems/usaush_con.csv
@@ -80,6 +80,7 @@ usaush;US66;His;(West) Clinton, OK;ok.us066hiswcl
 usaush;US66;His;(South) Clinton, OK;ok.us066hisscl
 usaush;US66;His;(South) Weatherford, OK;ok.us066hisswe
 usaush;US66;His;Geary, OK;ok.us066hisgea
+usaush;US66;His;(1926-1932 Original Alignment) El Reno, OK;ok.us066hisren
 usaush;US66;His;(1958 Alignment) Lake Overholser, OK;ok.us066hislak
 usaush;US66;His;(1933 Alignment) Crestwood, OK;ok.us066hiscre
 usaush;US66;His;(1947 Beltline) Belle Isle, OK;ok.us066hisbel
@@ -87,6 +88,18 @@ usaush;US66;His;(1930 Alignment) Uptown Oklahoma City, OK;ok.us066hisupt
 usaush;US66;His;(1936 Beltline) Helm Farm, OK;ok.us066hishel
 usaush;US66;His;(1931 Beltline) Britton, OK;ok.us066hisbri
 usaush;US66;His;(Lincoln Blvd 1959) Central Park, OK;ok.us066hiscen
+usaush;US66;His;(1926-1928) Depew, OK;ok.us066hisdep
+usaush;US66;His;(1926-1932) Tulsa, OK;ok.us066hisntu
+usaush;US66;His;Foyil, OK;ok.us066hisfoy
+usaush;US66;His;Miami, OK;ok.us066hismia
+usaush;US66;His;(1940-1975) Joplin, MO;mo.us066hisejo
+usaush;US66;His;(1930-1955) Joplin, MO;mo.us066hisnjo
+usaush;US66;His;(1954-1975) Carthage, MO;mo.us066hiscar
+usaush;US66;His;(1936-1970) Springfield, MO;mo.us066hisnsp
+usaush;US66;His;(1926-1928) Springfield, MO;mo.us066hisesp
+usaush;US66;His;Rolla, MO;mo.us066hisrol
+usaush;US66;His;(1926-1933) Manchester, MO;mo.us066hisman
+usaush;US66;His;(1936-1965) Florissant, MO;mo.us066hisflo
 usaush;US66;His;(1926-1932) Tulsa;ok.us066hisntu
 usaush;US66;His;Foyil;ok.us066hisfoy
 usaush;US66;His;Miami;ok.us066hismia
diff --git a/updates.csv b/updates.csv
index e6027e758d9..69c5c32b3e2 100644
--- a/updates.csv
+++ b/updates.csv
@@ -5216,6 +5216,7 @@ date;region;route;root;description
 2025-03-24;Philippines;E2;phl.e002;Route truncated at north end from E1 to N1/N145 (continuation now mapped as PHL Sky)
 2025-03-24;Philippines;E5;phl.e005;Route extended west from N130 to N120
 2021-12-14;Philippines;E2;phl.e002;Route extended at north end from N140 to E1
+2026-10-20;Poland;DK65;pol.dk065;Route removed from Ulica Studzienna, Ulica Elcka and Ulica Szosa Knyszynska and relocated onto DK8, future S19 and future S16 between Ulica Studzienna and DW669
 2026-08-14;Poland;S19 (Bielsk Podlaski);pol.s019bie;Route extended at north end from exit 15 to exit 14
 2026-08-14;Poland;DK19 (Kuznica);pol.dk019kuz;Route reentered
 2026-08-14;Poland;DK19 (Bialystok);pol.dk019;Route truncated from S19 exit 15 to S19 exit 14