diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002077.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002077.wpt
index a2244a4a7e8..13f38800ee8 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002077.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002077.wpt
@@ -3,7 +3,7 @@ D235_E http://www.openstreetmap.org/?lat=48.856238&lon=2.911055
 D235_W http://www.openstreetmap.org/?lat=48.854769&lon=2.909872
 +X69 http://www.openstreetmap.org/?lat=48.854610&lon=2.923450
 D20E5 http://www.openstreetmap.org/?lat=48.846414&lon=2.912927
-D21_W http://www.openstreetmap.org/?lat=48.830073&lon=2.901571
+D21_S http://www.openstreetmap.org/?lat=48.830073&lon=2.901571
 D20E1 http://www.openstreetmap.org/?lat=48.810282&lon=2.925909
 D216 http://www.openstreetmap.org/?lat=48.792560&lon=2.934927
 D231 http://www.openstreetmap.org/?lat=48.752585&lon=2.943832
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002177.wpt
index 5d797cb0301..4bd99a7a968 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002177.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002177.wpt
@@ -11,7 +11,7 @@ D231_N http://www.openstreetmap.org/?lat=48.818645&lon=2.818471
 D96 http://www.openstreetmap.org/?lat=48.823360&lon=2.834872
 D231_S http://www.openstreetmap.org/?lat=48.815121&lon=2.841945
 D1036 http://www.openstreetmap.org/?lat=48.822512&lon=2.877077
-D20 http://www.openstreetmap.org/?lat=48.830073&lon=2.901571
+D20_S http://www.openstreetmap.org/?lat=48.830073&lon=2.901571
 D20E5 http://www.openstreetmap.org/?lat=48.846414&lon=2.912927
 +X69 http://www.openstreetmap.org/?lat=48.854610&lon=2.923450
 D235_W http://www.openstreetmap.org/?lat=48.854769&lon=2.909872
@@ -23,8 +23,8 @@ D934_E http://www.openstreetmap.org/?lat=48.859033&lon=2.918093
 D85 http://www.openstreetmap.org/?lat=48.860099&lon=2.924235
 D228 http://www.openstreetmap.org/?lat=48.876511&lon=2.979687
 +X75 http://www.openstreetmap.org/?lat=48.881042&lon=3.003192
-D19_N http://www.openstreetmap.org/?lat=48.900117&lon=3.035544
+D19_W http://www.openstreetmap.org/?lat=48.900117&lon=3.035544
 D44 http://www.openstreetmap.org/?lat=48.899337&lon=3.039967
-D19_S http://www.openstreetmap.org/?lat=48.902446&lon=3.048934
+D19_E http://www.openstreetmap.org/?lat=48.902446&lon=3.048934
 D114P http://www.openstreetmap.org/?lat=48.927488&lon=3.073559
 D603 http://www.openstreetmap.org/?lat=48.946864&lon=3.091750
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002277.wpt
index dda6e0880db..f410f7b36ec 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002277.wpt
@@ -2,8 +2,8 @@ D40 http://www.openstreetmap.org/?lat=48.333956&lon=2.788250
 RouEpi_E http://www.openstreetmap.org/?lat=48.328280&lon=2.845199
 D218/D403 http://www.openstreetmap.org/?lat=48.324945&lon=2.849040
 D218_S http://www.openstreetmap.org/?lat=48.322982&lon=2.851314
-D120_S http://www.openstreetmap.org/?lat=48.316081&lon=2.901168
-D120_N http://www.openstreetmap.org/?lat=48.311687&lon=2.919979
+D120_W http://www.openstreetmap.org/?lat=48.316081&lon=2.901168
+D120_E http://www.openstreetmap.org/?lat=48.311687&lon=2.919979
 D22E/D123 http://www.openstreetmap.org/?lat=48.291652&lon=2.943569
 D219L http://www.openstreetmap.org/?lat=48.284025&lon=2.956403
 D92 http://www.openstreetmap.org/?lat=48.281979&lon=2.960673
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0022e77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0022e77.wpt
index ba94031bd07..dcb81caaf5e 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0022e77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0022e77.wpt
@@ -1,2 +1,2 @@
-D219 http://www.openstreetmap.org/?lat=48.293483&lon=2.948019
 D22/D123 http://www.openstreetmap.org/?lat=48.291652&lon=2.943569
+D219 http://www.openstreetmap.org/?lat=48.293483&lon=2.948019
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002377.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002377.wpt
index 4134eeff290..109cc0872f1 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002377.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002377.wpt
@@ -1,4 +1,4 @@
-D94 http://www.openstreetmap.org/?lat=49.090467&lon=3.075381
+D94/D102 http://www.openstreetmap.org/?lat=49.090467&lon=3.075381
 D102_S http://www.openstreetmap.org/?lat=49.089941&lon=3.076317
 D102A http://www.openstreetmap.org/?lat=49.087250&lon=3.078122
 D91 http://www.openstreetmap.org/?lat=49.074859&lon=3.128979
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002477.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002477.wpt
index 7bb555255fd..00b97319555 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002477.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002477.wpt
@@ -2,4 +2,4 @@ Ess/SeM http://www.openstreetmap.org/?lat=48.479632&lon=2.504413
 D50_S http://www.openstreetmap.org/?lat=48.493404&lon=2.543804
 D50_N http://www.openstreetmap.org/?lat=48.494073&lon=2.543799
 D607 http://www.openstreetmap.org/?lat=48.502350&lon=2.577324
-D24E/D372 http://www.openstreetmap.org/?lat=48.499090&lon=2.594552
+D372 http://www.openstreetmap.org/?lat=48.499090&lon=2.594552
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0024e77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0024e77.wpt
deleted file mode 100644
index 9c7ff882e0c..00000000000
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0024e77.wpt
+++ /dev/null
@@ -1,2 +0,0 @@
-D24/D372 http://www.openstreetmap.org/?lat=48.499090&lon=2.594552
-CheMilVil http://www.openstreetmap.org/?lat=48.494165&lon=2.598656
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002577.wpt
index 4f1c5bd7591..73a90de024f 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002577.wpt
@@ -1,10 +1,10 @@
 D15 http://www.openstreetmap.org/?lat=48.833239&lon=2.989754
 RouGraMor http://www.openstreetmap.org/?lat=48.824229&lon=2.983359
 D15E1 http://www.openstreetmap.org/?lat=48.808420&lon=2.994327
-D216_E http://www.openstreetmap.org/?lat=48.800702&lon=2.996950
-D216_W http://www.openstreetmap.org/?lat=48.799396&lon=2.997326
+D216_N http://www.openstreetmap.org/?lat=48.800702&lon=2.996950
+D216_S http://www.openstreetmap.org/?lat=48.799396&lon=2.997326
 D402 http://www.openstreetmap.org/?lat=48.761161&lon=3.024153
-D112E http://www.openstreetmap.org/?lat=48.758318&lon=3.026358
+D112E2 http://www.openstreetmap.org/?lat=48.758318&lon=3.026358
 D112_E http://www.openstreetmap.org/?lat=48.749143&lon=3.020312
 RuePar http://www.openstreetmap.org/?lat=48.735297&lon=3.011305
-D231 http://www.openstreetmap.org/?lat=48.732302&lon=3.005678
+D112/D231 http://www.openstreetmap.org/?lat=48.732302&lon=3.005678
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002877.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002877.wpt
index ac1253a2b65..22fc3350b83 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d002877.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d002877.wpt
@@ -1,10 +1,10 @@
 D403 http://www.openstreetmap.org/?lat=48.379599&lon=2.946374
 D403A/D605 http://www.openstreetmap.org/?lat=48.378131&lon=2.956266
 D605_S http://www.openstreetmap.org/?lat=48.375929&lon=2.957071
-D124_N http://www.openstreetmap.org/?lat=48.370680&lon=2.964039
+D124_Var http://www.openstreetmap.org/?lat=48.370680&lon=2.964039
 D606 http://www.openstreetmap.org/?lat=48.360673&lon=2.968975
 D124A http://www.openstreetmap.org/?lat=48.347053&lon=2.977783
-D124_S http://www.openstreetmap.org/?lat=48.328407&lon=2.990813
+D124_Esm http://www.openstreetmap.org/?lat=48.328407&lon=2.990813
 D28E http://www.openstreetmap.org/?lat=48.317258&lon=2.992361
 D92_E http://www.openstreetmap.org/?lat=48.282292&lon=2.971043
 D219_N http://www.openstreetmap.org/?lat=48.281754&lon=2.969334
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0028a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0028a77.wpt
index 97839b9efcf..6d6e67ca1c0 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0028a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0028a77.wpt
@@ -1,3 +1,3 @@
-D403 http://www.openstreetmap.org/?lat=48.377946&lon=2.945666
-RueAlbGra http://www.openstreetmap.org/?lat=48.375776&lon=2.930171
 D606 http://www.openstreetmap.org/?lat=48.361289&lon=2.888557
+RueAlbGra http://www.openstreetmap.org/?lat=48.375776&lon=2.930171
+D403 http://www.openstreetmap.org/?lat=48.377946&lon=2.945666
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003277.wpt
index 440a4363219..36afa8746b4 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003277.wpt
@@ -8,7 +8,7 @@ D96 http://www.openstreetmap.org/?lat=48.699862&lon=2.775177
 D1036 http://www.openstreetmap.org/?lat=48.675065&lon=2.813133
 GraRue_E http://www.openstreetmap.org/?lat=48.672114&lon=2.818656
 D48_W http://www.openstreetmap.org/?lat=48.666365&lon=2.820718
-D402_N http://www.openstreetmap.org/?lat=48.665424&lon=2.842589
+D48/D402 http://www.openstreetmap.org/?lat=48.665424&lon=2.842589
 D402_S http://www.openstreetmap.org/?lat=48.662003&lon=2.842525
 D32E4/D99 http://www.openstreetmap.org/?lat=48.646664&lon=2.859935
 D211 http://www.openstreetmap.org/?lat=48.641186&lon=2.869247
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003377.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003377.wpt
index 0962464d717..8c63d653e63 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003377.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003377.wpt
@@ -1,11 +1,11 @@
 D17/D603 http://www.openstreetmap.org/?lat=48.957792&lon=2.948713
 D33A http://www.openstreetmap.org/?lat=48.921107&lon=2.970525
-D125_N http://www.openstreetmap.org/?lat=48.920798&lon=2.969715
+D125_Vil http://www.openstreetmap.org/?lat=48.920798&lon=2.969715
 D228E http://www.openstreetmap.org/?lat=48.912162&lon=2.920869
 D228 http://www.openstreetmap.org/?lat=48.911478&lon=2.920617
 D85_N http://www.openstreetmap.org/?lat=48.896812&lon=2.906833
 D87 http://www.openstreetmap.org/?lat=48.893360&lon=2.909113
-D125_S http://www.openstreetmap.org/?lat=48.884438&lon=2.909617
+D125_Bou http://www.openstreetmap.org/?lat=48.884438&lon=2.909617
 D85_S http://www.openstreetmap.org/?lat=48.882169&lon=2.906801
 D33E http://www.openstreetmap.org/?lat=48.877259&lon=2.904814
 D21/D934 http://www.openstreetmap.org/?lat=48.859703&lon=2.907000
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035a77.wpt
index 8b6f3f6de40..b5e3c8743af 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035a77.wpt
@@ -1,2 +1,4 @@
 D418 http://www.openstreetmap.org/?lat=48.863093&lon=2.675056
+RuePie http://www.openstreetmap.org/?lat=48.860492&lon=2.690197
+RueSaiGer http://www.openstreetmap.org/?lat=48.861205&lon=2.695749
 D35 http://www.openstreetmap.org/?lat=48.860284&lon=2.703323
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035e77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035e77.wpt
index 263d4292c29..0ef2e763bc0 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035e77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0035e77.wpt
@@ -1,3 +1,3 @@
-D406 http://www.openstreetmap.org/?lat=48.831950&lon=2.698957
-RueTor http://www.openstreetmap.org/?lat=48.844059&lon=2.697637
 D35 http://www.openstreetmap.org/?lat=48.845609&lon=2.704968
+RueTor http://www.openstreetmap.org/?lat=48.844059&lon=2.697637
+D406 http://www.openstreetmap.org/?lat=48.831950&lon=2.698957
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003777.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003777.wpt
index fac1fdd28ae..5eeb182f91c 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003777.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003777.wpt
@@ -3,8 +3,8 @@ D204_N http://www.openstreetmap.org/?lat=48.893480&lon=3.166670
 D204_S http://www.openstreetmap.org/?lat=48.890873&lon=3.170561
 D19_E http://www.openstreetmap.org/?lat=48.865597&lon=3.163971
 D19_W http://www.openstreetmap.org/?lat=48.864053&lon=3.158470
-D37A_N http://www.openstreetmap.org/?lat=48.863131&lon=3.157408
-D37A_S http://www.openstreetmap.org/?lat=48.846587&lon=3.151432
+D37A_Dou http://www.openstreetmap.org/?lat=48.863131&lon=3.157408
+D37A_Ger http://www.openstreetmap.org/?lat=48.846587&lon=3.151432
 D222 http://www.openstreetmap.org/?lat=48.822728&lon=3.137224
 D66 http://www.openstreetmap.org/?lat=48.816582&lon=3.132541
 D209/D934 http://www.openstreetmap.org/?lat=48.789558&lon=3.124044
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0037a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0037a77.wpt
index bedfe3ff24f..6c4de5908eb 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0037a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0037a77.wpt
@@ -1,3 +1,3 @@
-D37_N http://www.openstreetmap.org/?lat=48.863131&lon=3.157408
+D37_Dou http://www.openstreetmap.org/?lat=48.863131&lon=3.157408
 RueFon http://www.openstreetmap.org/?lat=48.850345&lon=3.144048
-D37_S http://www.openstreetmap.org/?lat=48.846587&lon=3.151432
+D37_Ger http://www.openstreetmap.org/?lat=48.846587&lon=3.151432
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003977.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003977.wpt
index 017d85501eb..5c9b3ecd1f2 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d003977.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d003977.wpt
@@ -1,8 +1,8 @@
 D39E http://www.openstreetmap.org/?lat=48.538469&lon=2.653464
 D415 http://www.openstreetmap.org/?lat=48.537377&lon=2.659743
 D82E http://www.openstreetmap.org/?lat=48.531471&lon=2.668648
-D115_S http://www.openstreetmap.org/?lat=48.488960&lon=2.698249
-D115_N http://www.openstreetmap.org/?lat=48.487309&lon=2.703101
+D115_W http://www.openstreetmap.org/?lat=48.488960&lon=2.698249
+D115_E http://www.openstreetmap.org/?lat=48.487309&lon=2.703101
 D116 http://www.openstreetmap.org/?lat=48.486635&lon=2.752614
 D107 http://www.openstreetmap.org/?lat=48.465180&lon=2.774415
 D227E http://www.openstreetmap.org/?lat=48.448694&lon=2.765317
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0039e77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0039e77.wpt
index 96865e03cac..365961b135a 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0039e77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0039e77.wpt
@@ -1,3 +1,3 @@
-D39_W http://www.openstreetmap.org/?lat=48.525304&lon=2.594471
+D39_Boi http://www.openstreetmap.org/?lat=48.525304&lon=2.594471
 RueVar http://www.openstreetmap.org/?lat=48.519300&lon=2.606876
-D39_E http://www.openstreetmap.org/?lat=48.538469&lon=2.653464
+D39_Mel http://www.openstreetmap.org/?lat=48.538469&lon=2.653464
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004077.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004077.wpt
index 4c6f763788d..b9c0583e563 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004077.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004077.wpt
@@ -7,8 +7,8 @@ D58_S http://www.openstreetmap.org/?lat=48.319386&lon=2.746201
 D40D http://www.openstreetmap.org/?lat=48.307501&lon=2.708640
 D240 http://www.openstreetmap.org/?lat=48.280740&lon=2.698415
 D403_E http://www.openstreetmap.org/?lat=48.267516&lon=2.699273
-D607_S http://www.openstreetmap.org/?lat=48.267451&lon=2.698530
-D607_N http://www.openstreetmap.org/?lat=48.267077&lon=2.692871
+D607_E http://www.openstreetmap.org/?lat=48.267451&lon=2.698530
+D607_W http://www.openstreetmap.org/?lat=48.267077&lon=2.692871
 D403_W http://www.openstreetmap.org/?lat=48.262520&lon=2.693517
 RueCha http://www.openstreetmap.org/?lat=48.256822&lon=2.693254
 D118 http://www.openstreetmap.org/?lat=48.241183&lon=2.701784
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004177.wpt
index cff0d960057..762991010d0 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004177.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004177.wpt
@@ -4,6 +4,6 @@ D41E1 http://www.openstreetmap.org/?lat=49.037933&lon=2.738999
 D401_W http://www.openstreetmap.org/?lat=49.047948&lon=2.747287
 D401_E http://www.openstreetmap.org/?lat=49.044894&lon=2.760994
 N330 http://www.openstreetmap.org/?lat=49.052715&lon=2.786257
-D9_W http://www.openstreetmap.org/?lat=49.070137&lon=2.815716
-D9_E http://www.openstreetmap.org/?lat=49.070531&lon=2.816215
+D9E1_W http://www.openstreetmap.org/?lat=49.070137&lon=2.815716
+D9E1_E http://www.openstreetmap.org/?lat=49.070531&lon=2.816215
 IDF/HDF http://www.openstreetmap.org/?lat=49.074655&lon=2.854163
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004277.wpt
index 53dd63cfd4f..ae55a62718a 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004277.wpt
@@ -3,6 +3,6 @@ D204 http://www.openstreetmap.org/?lat=48.845136&lon=3.234881
 D46 http://www.openstreetmap.org/?lat=48.838243&lon=3.329083
 D113_S http://www.openstreetmap.org/?lat=48.829448&lon=3.375214
 D113_N http://www.openstreetmap.org/?lat=48.830126&lon=3.379701
-D215_E http://www.openstreetmap.org/?lat=48.825769&lon=3.403831
-D215_W http://www.openstreetmap.org/?lat=48.824070&lon=3.404050
+D215_N http://www.openstreetmap.org/?lat=48.825769&lon=3.403831
+D215_S http://www.openstreetmap.org/?lat=48.824070&lon=3.404050
 IDF/GES http://www.openstreetmap.org/?lat=48.815718&lon=3.421737
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004677.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004677.wpt
index 40c93bd400e..76eb2fe5b38 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004677.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004677.wpt
@@ -1,5 +1,5 @@
-D215 http://www.openstreetmap.org/?lat=48.786446&lon=3.309446
-D42 http://www.openstreetmap.org/?lat=48.838243&lon=3.329083
-D6_W http://www.openstreetmap.org/?lat=48.857023&lon=3.318413
-D6_E http://www.openstreetmap.org/?lat=48.857404&lon=3.320119
 D31 http://www.openstreetmap.org/?lat=48.861186&lon=3.320918
+D6_E http://www.openstreetmap.org/?lat=48.857404&lon=3.320119
+D6_W http://www.openstreetmap.org/?lat=48.857023&lon=3.318413
+D42 http://www.openstreetmap.org/?lat=48.838243&lon=3.329083
+D215 http://www.openstreetmap.org/?lat=48.786446&lon=3.309446
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004877.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004877.wpt
index a5109e6e516..0da9a0dc420 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d004877.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d004877.wpt
@@ -1,6 +1,6 @@
 D50 http://www.openstreetmap.org/?lat=48.664129&lon=2.563470
 N104 http://www.openstreetmap.org/?lat=48.657441&lon=2.612922
-A5B http://www.openstreetmap.org/?lat=48.647754&lon=2.625604
+A5b http://www.openstreetmap.org/?lat=48.647754&lon=2.625604
 AllCha http://www.openstreetmap.org/?lat=48.652558&lon=2.633074
 D35_S http://www.openstreetmap.org/?lat=48.647391&lon=2.671740
 D35_N http://www.openstreetmap.org/?lat=48.647959&lon=2.676525
@@ -15,4 +15,4 @@ D144 http://www.openstreetmap.org/?lat=48.667436&lon=2.842777
 D436 http://www.openstreetmap.org/?lat=48.674780&lon=2.849217
 D402_E http://www.openstreetmap.org/?lat=48.680578&lon=2.881004
 RouBer http://www.openstreetmap.org/?lat=48.683091&lon=2.922881
-D1004 http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
+D49B/D201A http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049a477.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049a477.wpt
index c3631eec203..e1d85800344 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049a477.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049a477.wpt
@@ -1,3 +1,3 @@
-D75E http://www.openstreetmap.org/?lat=48.582568&lon=3.192320
+D75E2 http://www.openstreetmap.org/?lat=48.582568&lon=3.192320
 +X52 http://www.openstreetmap.org/?lat=48.574460&lon=3.192588
 D619 http://www.openstreetmap.org/?lat=48.559797&lon=3.218243
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049b77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049b77.wpt
index 9b3adf4ca16..3b0483376b8 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049b77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0049b77.wpt
@@ -1,2 +1,2 @@
-D1004 http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
+D48/D201A http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
 D211 http://www.openstreetmap.org/?lat=48.668944&lon=2.943011
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005077.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005077.wpt
index 0cf6cff27b3..9378f83518b 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005077.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005077.wpt
@@ -8,12 +8,12 @@ N104 http://www.openstreetmap.org/?lat=48.645374&lon=2.549826
 RueCan http://www.openstreetmap.org/?lat=48.636571&lon=2.546505
 D402_W http://www.openstreetmap.org/?lat=48.626484&lon=2.552991
 D402_E http://www.openstreetmap.org/?lat=48.622045&lon=2.557465
-A5A http://www.openstreetmap.org/?lat=48.618101&lon=2.554793
+A5a http://www.openstreetmap.org/?lat=48.618101&lon=2.554793
 AllAirTem http://www.openstreetmap.org/?lat=48.614314&lon=2.552454
 D151 http://www.openstreetmap.org/?lat=48.588276&lon=2.562714
 D346_W http://www.openstreetmap.org/?lat=48.581540&lon=2.553702
 D346_E http://www.openstreetmap.org/?lat=48.577874&lon=2.563752
-D50E http://www.openstreetmap.org/?lat=48.565708&lon=2.557494
+D50E3 http://www.openstreetmap.org/?lat=48.565708&lon=2.557494
 RuePort http://www.openstreetmap.org/?lat=48.562362&lon=2.548740
 D82 http://www.openstreetmap.org/?lat=48.552619&lon=2.547771
 D39 http://www.openstreetmap.org/?lat=48.538256&lon=2.548270
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005277.wpt
index 8fd5fd88a6b..f91a7eb21b4 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005277.wpt
@@ -3,9 +3,9 @@ D4 http://www.openstreetmap.org/?lat=48.278109&lon=2.584724
 +X22 http://www.openstreetmap.org/?lat=48.268567&lon=2.599900
 D98_W http://www.openstreetmap.org/?lat=48.246783&lon=2.598342
 D98_E http://www.openstreetmap.org/?lat=48.245900&lon=2.600082
-D52A_N http://www.openstreetmap.org/?lat=48.239200&lon=2.607432
+D52A_Che http://www.openstreetmap.org/?lat=48.239200&lon=2.607432
 D403_E http://www.openstreetmap.org/?lat=48.229515&lon=2.629281
-D52A_S http://www.openstreetmap.org/?lat=48.217190&lon=2.606936
+D52A_Auf http://www.openstreetmap.org/?lat=48.217190&lon=2.606936
 D403_W http://www.openstreetmap.org/?lat=48.216831&lon=2.606115
 D118_N http://www.openstreetmap.org/?lat=48.197329&lon=2.657812
 D118_S http://www.openstreetmap.org/?lat=48.194597&lon=2.658176
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0052a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0052a77.wpt
index 772649bf3a7..74bb45ec591 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0052a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0052a77.wpt
@@ -1,2 +1,2 @@
-D52_N http://www.openstreetmap.org/?lat=48.239200&lon=2.607432
+D52_Che http://www.openstreetmap.org/?lat=48.239200&lon=2.607432
 D52/D403 http://www.openstreetmap.org/?lat=48.217190&lon=2.606936
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005377.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005377.wpt
index cee37f1ca34..42588113a46 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005377.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005377.wpt
@@ -1,4 +1,4 @@
-D603_W http://www.openstreetmap.org/?lat=48.951321&lon=3.018982
+D603_Jea http://www.openstreetmap.org/?lat=48.951321&lon=3.018982
 D3E http://www.openstreetmap.org/?lat=48.958635&lon=3.026892
 +X14 http://www.openstreetmap.org/?lat=48.975522&lon=3.047201
 +X11 http://www.openstreetmap.org/?lat=48.991619&lon=3.045713
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005577.wpt
index 958d16fa3b4..965ea78b350 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005577.wpt
@@ -2,12 +2,12 @@ D402 http://www.openstreetmap.org/?lat=48.977094&lon=3.220813
 D68P http://www.openstreetmap.org/?lat=48.972964&lon=3.220080
 D70 http://www.openstreetmap.org/?lat=48.967086&lon=3.224364
 D407_W http://www.openstreetmap.org/?lat=48.925508&lon=3.242252
-D407_E http://www.openstreetmap.org/?lat=48.920906&lon=3.267848
+D55E/D407 http://www.openstreetmap.org/?lat=48.920906&lon=3.267848
 D31 http://www.openstreetmap.org/?lat=48.890901&lon=3.251178
 D55B http://www.openstreetmap.org/?lat=48.891813&lon=3.248429
 +X19 http://www.openstreetmap.org/?lat=48.883104&lon=3.261942
 +X11 http://www.openstreetmap.org/?lat=48.878116&lon=3.247908
-D222_E http://www.openstreetmap.org/?lat=48.849450&lon=3.234953
+D222_N http://www.openstreetmap.org/?lat=48.849450&lon=3.234953
 D204 http://www.openstreetmap.org/?lat=48.848221&lon=3.233019
 D222_S http://www.openstreetmap.org/?lat=48.846765&lon=3.232735
 +X98 http://www.openstreetmap.org/?lat=48.846612&lon=3.231010
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005777.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005777.wpt
index 068537e0d04..6909be849e2 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005777.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005777.wpt
@@ -7,14 +7,14 @@ D402_W http://www.openstreetmap.org/?lat=48.626220&lon=2.573971
 +X43 http://www.openstreetmap.org/?lat=48.619172&lon=2.585789
 D402_E http://www.openstreetmap.org/?lat=48.621690&lon=2.602000
 D305 http://www.openstreetmap.org/?lat=48.613739&lon=2.623447
-A5B http://www.openstreetmap.org/?lat=48.613704&lon=2.631869
+A5b http://www.openstreetmap.org/?lat=48.613704&lon=2.631869
 +X72 http://www.openstreetmap.org/?lat=48.605535&lon=2.641131
 D35 http://www.openstreetmap.org/?lat=48.600599&lon=2.673650
 D471 http://www.openstreetmap.org/?lat=48.597375&lon=2.692149
 D1036 http://www.openstreetmap.org/?lat=48.591831&lon=2.725940
 D130A http://www.openstreetmap.org/?lat=48.590527&lon=2.732989
-D130_N http://www.openstreetmap.org/?lat=48.585628&lon=2.761672
-D130_S http://www.openstreetmap.org/?lat=48.588185&lon=2.778023
+D130_W http://www.openstreetmap.org/?lat=48.585628&lon=2.761672
+D130_E http://www.openstreetmap.org/?lat=48.588185&lon=2.778023
 D99E http://www.openstreetmap.org/?lat=48.588215&lon=2.782151
 D47/D215 http://www.openstreetmap.org/?lat=48.582601&lon=2.802731
 D47_N http://www.openstreetmap.org/?lat=48.584374&lon=2.806025
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005877.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005877.wpt
index fc70fbb7480..f30327c4690 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d005877.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d005877.wpt
@@ -13,6 +13,6 @@ D69 http://www.openstreetmap.org/?lat=48.259225&lon=2.811406
 D136/D225 http://www.openstreetmap.org/?lat=48.240452&lon=2.809198
 D225_E http://www.openstreetmap.org/?lat=48.238848&lon=2.814678
 D40E http://www.openstreetmap.org/?lat=48.214726&lon=2.821732
-D120_E http://www.openstreetmap.org/?lat=48.211466&lon=2.824583
-D120_W http://www.openstreetmap.org/?lat=48.203436&lon=2.827311
+D120_N http://www.openstreetmap.org/?lat=48.211466&lon=2.824583
+D120_S http://www.openstreetmap.org/?lat=48.203436&lon=2.827311
 D30 http://www.openstreetmap.org/?lat=48.181019&lon=2.853530
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0059a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0059a77.wpt
index 883f1c00521..ebc193e1b49 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0059a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0059a77.wpt
@@ -1,4 +1,4 @@
-D49A http://www.openstreetmap.org/?lat=48.456642&lon=3.373854
+D49A1 http://www.openstreetmap.org/?lat=48.456642&lon=3.373854
 D49/D78 http://www.openstreetmap.org/?lat=48.448703&lon=3.353424
 +X30 http://www.openstreetmap.org/?lat=48.438764&lon=3.317372
 D411_E http://www.openstreetmap.org/?lat=48.430405&lon=3.316492
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d006377.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d006377.wpt
index 831591eea94..118aab90976 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d006377.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d006377.wpt
@@ -6,7 +6,7 @@ D64_N http://www.openstreetmap.org/?lat=48.356844&lon=2.562676
 D64_S http://www.openstreetmap.org/?lat=48.353902&lon=2.570028
 D152_W http://www.openstreetmap.org/?lat=48.339954&lon=2.599656
 D152_E http://www.openstreetmap.org/?lat=48.343078&lon=2.601574
-D63E http://www.openstreetmap.org/?lat=48.343140&lon=2.603030
+D63E1 http://www.openstreetmap.org/?lat=48.343140&lon=2.603030
 D63D_N http://www.openstreetmap.org/?lat=48.325575&lon=2.647169
 D104_W http://www.openstreetmap.org/?lat=48.320692&lon=2.646412
 D104_E http://www.openstreetmap.org/?lat=48.320533&lon=2.647662
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e177.wpt
new file mode 100644
index 00000000000..0cf2aadd1c3
--- /dev/null
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e177.wpt
@@ -0,0 +1,2 @@
+D63 http://www.openstreetmap.org/?lat=48.343140&lon=2.603030
+D63E2 http://www.openstreetmap.org/?lat=48.345723&lon=2.640769
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e277.wpt
new file mode 100644
index 00000000000..4ffbd477869
--- /dev/null
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e277.wpt
@@ -0,0 +1,3 @@
+D63E1 http://www.openstreetmap.org/?lat=48.345723&lon=2.640769
+D301 http://www.openstreetmap.org/?lat=48.365236&lon=2.660086
+D607 http://www.openstreetmap.org/?lat=48.379442&lon=2.686377
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e77.wpt
deleted file mode 100644
index adc80d4689d..00000000000
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0063e77.wpt
+++ /dev/null
@@ -1,4 +0,0 @@
-D63 http://www.openstreetmap.org/?lat=48.343140&lon=2.603030
-RueGra_S http://www.openstreetmap.org/?lat=48.345723&lon=2.640769
-D301 http://www.openstreetmap.org/?lat=48.365236&lon=2.660086
-D607 http://www.openstreetmap.org/?lat=48.379442&lon=2.686377
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d007577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d007577.wpt
index b3b6e8da9b1..bb8f8dcfe42 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d007577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d007577.wpt
@@ -7,7 +7,7 @@ D15_E http://www.openstreetmap.org/?lat=48.701057&lon=3.245140
 D1004 http://www.openstreetmap.org/?lat=48.699809&lon=3.245728
 D55_S http://www.openstreetmap.org/?lat=48.688043&lon=3.245797
 D75B http://www.openstreetmap.org/?lat=48.678995&lon=3.238966
-D75A_N http://www.openstreetmap.org/?lat=48.652258&lon=3.218790
+D75A http://www.openstreetmap.org/?lat=48.652258&lon=3.218790
 D231 http://www.openstreetmap.org/?lat=48.621428&lon=3.195573
 D12 http://www.openstreetmap.org/?lat=48.615607&lon=3.194712
 D75E2 http://www.openstreetmap.org/?lat=48.592560&lon=3.173166
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008277.wpt
index 729dd974956..17e769b6365 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008277.wpt
@@ -3,8 +3,7 @@ D346 http://www.openstreetmap.org/?lat=48.560889&lon=2.595338
 AveChaMon_W http://www.openstreetmap.org/?lat=48.562900&lon=2.603658
 AveChaMon_E http://www.openstreetmap.org/?lat=48.562795&lon=2.605986
 D306 http://www.openstreetmap.org/?lat=48.568195&lon=2.625915
-D305 http://www.openstreetmap.org/?lat=48.574634&lon=2.635667
-A5B http://www.openstreetmap.org/?lat=48.574648&lon=2.639465
+A5b http://www.openstreetmap.org/?lat=48.574648&lon=2.639465
 D35 http://www.openstreetmap.org/?lat=48.570559&lon=2.664882
 D471 http://www.openstreetmap.org/?lat=48.568193&lon=2.675858
-D117/D1036 http://www.openstreetmap.org/?lat=48.564865&lon=2.690620
+D82E/D117 http://www.openstreetmap.org/?lat=48.564865&lon=2.690620
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477.wpt
index 7ff73153ec0..657c89fb573 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477.wpt
@@ -7,7 +7,7 @@ D9_E http://www.openstreetmap.org/?lat=48.984398&lon=2.623957
 RueMarBer http://www.openstreetmap.org/?lat=48.977851&lon=2.630507
 D139_S http://www.openstreetmap.org/?lat=48.976404&lon=2.628259
 D84A4 http://www.openstreetmap.org/?lat=48.974323&lon=2.613207
-A105 http://www.openstreetmap.org/?lat=48.966216&lon=2.606549
+A104 http://www.openstreetmap.org/?lat=48.966216&lon=2.606549
 D309 http://www.openstreetmap.org/?lat=48.963770&lon=2.604723
 AveJBC_S http://www.openstreetmap.org/?lat=48.956834&lon=2.602424
 +X55 http://www.openstreetmap.org/?lat=48.952585&lon=2.606184
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477cou.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477cou.wpt
index c5d7e314d23..b6e2e26df30 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477cou.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d008477cou.wpt
@@ -1,3 +1,3 @@
-D603/D933 http://www.openstreetmap.org/?lat=48.934662&lon=2.602242
+D84/D603 http://www.openstreetmap.org/?lat=48.934662&lon=2.602242
 D84A1 http://www.openstreetmap.org/?lat=48.924214&lon=2.604371
 D86 http://www.openstreetmap.org/?lat=48.918305&lon=2.603652
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084a277.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084a277.wpt
index cd891d0740f..efce9b45d20 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084a277.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084a277.wpt
@@ -1,3 +1,4 @@
 D84 http://www.openstreetmap.org/?lat=48.950424&lon=2.603030
-D105 http://www.openstreetmap.org/?lat=48.939490&lon=2.615460
-D84C http://www.openstreetmap.org/?lat=48.940438&lon=2.623919
+D105_N http://www.openstreetmap.org/?lat=48.939490&lon=2.615460
++X58 http://www.openstreetmap.org/?lat=48.940427&lon=2.620057
+D84C/D105 http://www.openstreetmap.org/?lat=48.936491&lon=2.620261
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084c77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084c77.wpt
index 868722e7517..91c6032b495 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084c77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0084c77.wpt
@@ -1,4 +1,3 @@
 A104 http://www.openstreetmap.org/?lat=48.949401&lon=2.628855
 AveJeanMon http://www.openstreetmap.org/?lat=48.946350&lon=2.626730
-D84A2 http://www.openstreetmap.org/?lat=48.940438&lon=2.623919
-D105/D603 http://www.openstreetmap.org/?lat=48.936491&lon=2.620261
+D84A2/D105 http://www.openstreetmap.org/?lat=48.936491&lon=2.620261
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0088a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0088a77.wpt
index 768edde45aa..d617a9cd8a8 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0088a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0088a77.wpt
@@ -1,2 +1,2 @@
-D231 http://www.openstreetmap.org/?lat=48.831567&lon=2.798853
+A4 http://www.openstreetmap.org/?lat=48.833538&lon=2.795763
 D88 http://www.openstreetmap.org/?lat=48.816806&lon=2.792118
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d010577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d010577.wpt
index dfc33f4850e..242a349701c 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d010577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d010577.wpt
@@ -1,7 +1,7 @@
 SSD/SeM http://www.openstreetmap.org/?lat=48.938045&lon=2.597717
 D84 http://www.openstreetmap.org/?lat=48.938396&lon=2.601110
-D84A http://www.openstreetmap.org/?lat=48.939490&lon=2.615460
-D603 http://www.openstreetmap.org/?lat=48.936491&lon=2.620261
+D84A2_N http://www.openstreetmap.org/?lat=48.939490&lon=2.615460
+D84A2/D603 http://www.openstreetmap.org/?lat=48.936491&lon=2.620261
 A104 http://www.openstreetmap.org/?lat=48.936061&lon=2.628050
 D34 http://www.openstreetmap.org/?lat=48.919200&lon=2.651369
 D404 http://www.openstreetmap.org/?lat=48.911869&lon=2.679841
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d010877.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d010877.wpt
index f92c3ab5adf..f46650cfc1d 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d010877.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d010877.wpt
@@ -3,7 +3,7 @@ C7 http://www.openstreetmap.org/?lat=48.775180&lon=3.390175
 D934 http://www.openstreetmap.org/?lat=48.763267&lon=3.386407
 D108E http://www.openstreetmap.org/?lat=48.751771&lon=3.388577
 D111_E http://www.openstreetmap.org/?lat=48.737693&lon=3.387595
-D60_S http://www.openstreetmap.org/?lat=48.735113&lon=3.378773
-D60_N http://www.openstreetmap.org/?lat=48.734584&lon=3.371875
+D60_E http://www.openstreetmap.org/?lat=48.735113&lon=3.378773
+D60_W http://www.openstreetmap.org/?lat=48.734584&lon=3.371875
 D111_W http://www.openstreetmap.org/?lat=48.730537&lon=3.362704
 D71 http://www.openstreetmap.org/?lat=48.714061&lon=3.356538
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0109a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0109a77.wpt
index 6af206135c5..0992e6fd309 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0109a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0109a77.wpt
@@ -1,2 +1,3 @@
+TurCai http://www.openstreetmap.org/?lat=48.421006&lon=3.172487
+RueRoi http://www.openstreetmap.org/?lat=48.398656&lon=3.185230
 D2411 http://www.openstreetmap.org/?lat=48.396895&lon=3.186963
-End http://www.openstreetmap.org/?lat=48.421006&lon=3.172487
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d011177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d011177.wpt
index 791e60aecfa..2234fb9de34 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d011177.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d011177.wpt
@@ -9,8 +9,8 @@ D204 http://www.openstreetmap.org/?lat=48.738520&lon=3.289252
 D71_N http://www.openstreetmap.org/?lat=48.730993&lon=3.328764
 D71_S http://www.openstreetmap.org/?lat=48.730467&lon=3.340184
 D108_S http://www.openstreetmap.org/?lat=48.730537&lon=3.362704
-D60_N http://www.openstreetmap.org/?lat=48.734584&lon=3.371875
-D60_S http://www.openstreetmap.org/?lat=48.735113&lon=3.378773
+D60_W http://www.openstreetmap.org/?lat=48.734584&lon=3.371875
+D60_E http://www.openstreetmap.org/?lat=48.735113&lon=3.378773
 D108_N http://www.openstreetmap.org/?lat=48.737693&lon=3.387595
 +X79 http://www.openstreetmap.org/?lat=48.742032&lon=3.399684
 D119_N http://www.openstreetmap.org/?lat=48.736550&lon=3.427391
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d012477.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d012477.wpt
index d6e235ef652..408e6f7c4ea 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d012477.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d012477.wpt
@@ -1,7 +1,7 @@
-D28_N http://www.openstreetmap.org/?lat=48.370680&lon=2.964039
+D28_Var http://www.openstreetmap.org/?lat=48.370680&lon=2.964039
 D124A_N http://www.openstreetmap.org/?lat=48.366368&lon=2.975396
 D124A_S http://www.openstreetmap.org/?lat=48.364636&lon=2.985009
 D606 http://www.openstreetmap.org/?lat=48.352606&lon=3.006445
 RueGra_E http://www.openstreetmap.org/?lat=48.345442&lon=3.016849
 +X61 http://www.openstreetmap.org/?lat=48.335611&lon=3.014580
-D28_S http://www.openstreetmap.org/?lat=48.328407&lon=2.990813
+D28_Esm http://www.openstreetmap.org/?lat=48.328407&lon=2.990813
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d012577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d012577.wpt
index e946753dd1c..138bc8e31c0 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d012577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d012577.wpt
@@ -1,4 +1,4 @@
-D33_N http://www.openstreetmap.org/?lat=48.920798&lon=2.969715
+D33_Vil http://www.openstreetmap.org/?lat=48.920798&lon=2.969715
 +X39 http://www.openstreetmap.org/?lat=48.901667&lon=2.960314
 D228 http://www.openstreetmap.org/?lat=48.895271&lon=2.940919
 D87_E http://www.openstreetmap.org/?lat=48.891877&lon=2.935149
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d015077.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d015077.wpt
index b216151f204..0dd159a17d5 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d015077.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d015077.wpt
@@ -1,5 +1,5 @@
 D306 http://www.openstreetmap.org/?lat=48.612514&lon=2.574526
-A5A http://www.openstreetmap.org/?lat=48.609051&lon=2.577710
+A5a http://www.openstreetmap.org/?lat=48.609051&lon=2.577710
 AveEur http://www.openstreetmap.org/?lat=48.596525&lon=2.587854
 D151 http://www.openstreetmap.org/?lat=48.587474&lon=2.594275
 D346 http://www.openstreetmap.org/?lat=48.566253&lon=2.590507
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0201a77.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0201a77.wpt
index dd9a6487a6d..c1bbbb439ed 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d0201a77.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d0201a77.wpt
@@ -1,3 +1,3 @@
-D1004 http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
+D48/D49B http://www.openstreetmap.org/?lat=48.684657&lon=2.937091
 D2 http://www.openstreetmap.org/?lat=48.683359&lon=2.954215
 D201 http://www.openstreetmap.org/?lat=48.684382&lon=2.969793
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d023177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d023177.wpt
index 1754f2d005f..e3fcb660c35 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d023177.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d023177.wpt
@@ -6,7 +6,6 @@ D344A http://www.openstreetmap.org/?lat=48.852055&lon=2.762917
 D345 http://www.openstreetmap.org/?lat=48.844271&lon=2.776494
 D406 http://www.openstreetmap.org/?lat=48.839441&lon=2.785141
 A4 http://www.openstreetmap.org/?lat=48.833538&lon=2.795763
-D88A http://www.openstreetmap.org/?lat=48.831567&lon=2.798853
 D21_W http://www.openstreetmap.org/?lat=48.818645&lon=2.818471
 D96 http://www.openstreetmap.org/?lat=48.823360&lon=2.834872
 D21_E http://www.openstreetmap.org/?lat=48.815121&lon=2.841945
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030177.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030177.wpt
index 6c7f045cc6c..be76f9545cb 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030177.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030177.wpt
@@ -2,7 +2,7 @@ D142/D607 http://www.openstreetmap.org/?lat=48.430397&lon=2.661266
 D409 http://www.openstreetmap.org/?lat=48.413607&lon=2.644146
 +X52 http://www.openstreetmap.org/?lat=48.392508&lon=2.629168
 D152 http://www.openstreetmap.org/?lat=48.372660&lon=2.643237
-D63E http://www.openstreetmap.org/?lat=48.365236&lon=2.660086
+D63E2 http://www.openstreetmap.org/?lat=48.365236&lon=2.660086
 D607_S http://www.openstreetmap.org/?lat=48.363235&lon=2.691723
 D58 http://www.openstreetmap.org/?lat=48.369567&lon=2.720004
 D148 http://www.openstreetmap.org/?lat=48.376565&lon=2.739622
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030577.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030577.wpt
index e8dbd949dd5..b9081aa03c6 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030577.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030577.wpt
@@ -1,6 +1,6 @@
 N104 http://www.openstreetmap.org/?lat=48.657441&lon=2.612922
-A5B(11) http://www.openstreetmap.org/?lat=48.647754&lon=2.625604
-A5B(12) http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
+A5b(11) http://www.openstreetmap.org/?lat=48.647754&lon=2.625604
+A5b(12) http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
 D57 http://www.openstreetmap.org/?lat=48.613739&lon=2.623447
 RueOur http://www.openstreetmap.org/?lat=48.610565&lon=2.622782
-D82 http://www.openstreetmap.org/?lat=48.574634&lon=2.635667
+A5b(14) http://www.openstreetmap.org/?lat=48.574648&lon=2.639465
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030677.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030677.wpt
index a8842e36d8a..dd4b730ff53 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d030677.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d030677.wpt
@@ -1,6 +1,6 @@
 D402 http://www.openstreetmap.org/?lat=48.623516&lon=2.561730
 D150 http://www.openstreetmap.org/?lat=48.612514&lon=2.574526
-A5A http://www.openstreetmap.org/?lat=48.607800&lon=2.580988
+A5a http://www.openstreetmap.org/?lat=48.607800&lon=2.580988
 AveEur http://www.openstreetmap.org/?lat=48.598160&lon=2.591132
 D151 http://www.openstreetmap.org/?lat=48.589510&lon=2.601088
 D82 http://www.openstreetmap.org/?lat=48.568195&lon=2.625915
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d040277lie.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d040277lie.wpt
index 0d700c00d34..ea1019138d8 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d040277lie.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d040277lie.wpt
@@ -5,4 +5,4 @@ D306 http://www.openstreetmap.org/?lat=48.623516&lon=2.561730
 D57_W http://www.openstreetmap.org/?lat=48.626220&lon=2.573971
 +X43 http://www.openstreetmap.org/?lat=48.619172&lon=2.585789
 D57_E http://www.openstreetmap.org/?lat=48.621690&lon=2.602000
-A5B http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
+A5b http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d060377.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d060377.wpt
index 488fa33617e..5b989993b08 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d060377.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d060377.wpt
@@ -9,7 +9,7 @@ D17A http://www.openstreetmap.org/?lat=48.957445&lon=2.936321
 D17/D33 http://www.openstreetmap.org/?lat=48.957792&lon=2.948713
 D19 http://www.openstreetmap.org/?lat=48.958838&lon=2.984510
 D17E http://www.openstreetmap.org/?lat=48.959218&lon=2.997208
-D53_W http://www.openstreetmap.org/?lat=48.951321&lon=3.018982
+D53_Jea http://www.openstreetmap.org/?lat=48.951321&lon=3.018982
 A4 http://www.openstreetmap.org/?lat=48.951536&lon=3.042612
 D21P http://www.openstreetmap.org/?lat=48.948185&lon=3.073018
 D21 http://www.openstreetmap.org/?lat=48.946864&lon=3.091750
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d060777.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d060777.wpt
index eeb8876fd89..addfd81a1de 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d060777.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d060777.wpt
@@ -12,7 +12,7 @@ D637 http://www.openstreetmap.org/?lat=48.455036&lon=2.616956
 D142/D301 http://www.openstreetmap.org/?lat=48.430397&lon=2.661266
 D409/D417 http://www.openstreetmap.org/?lat=48.408530&lon=2.686608
 D58/D152 http://www.openstreetmap.org/?lat=48.397062&lon=2.692283
-D63E http://www.openstreetmap.org/?lat=48.379442&lon=2.686377
+D63E2 http://www.openstreetmap.org/?lat=48.379442&lon=2.686377
 D301_S http://www.openstreetmap.org/?lat=48.363235&lon=2.691723
 AveBlaMon http://www.openstreetmap.org/?lat=48.331519&lon=2.688968
 D104 http://www.openstreetmap.org/?lat=48.324029&lon=2.686501
diff --git a/hwy_data/FRA-IDF/fraidfd77/fraidf.d061977.wpt b/hwy_data/FRA-IDF/fraidfd77/fraidf.d061977.wpt
index d20c1f30ae6..430a35e6994 100644
--- a/hwy_data/FRA-IDF/fraidfd77/fraidf.d061977.wpt
+++ b/hwy_data/FRA-IDF/fraidfd77/fraidf.d061977.wpt
@@ -1,4 +1,4 @@
-A5B http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
+A5b http://www.openstreetmap.org/?lat=48.631859&lon=2.628822
 D35 http://www.openstreetmap.org/?lat=48.630728&lon=2.663026
 D130/D471 http://www.openstreetmap.org/?lat=48.632738&lon=2.699300
 D130_S http://www.openstreetmap.org/?lat=48.633662&lon=2.716624
diff --git a/hwy_data/_systems/fraidfd77.csv b/hwy_data/_systems/fraidfd77.csv
index dbfb1137980..f374f1b299f 100644
--- a/hwy_data/_systems/fraidfd77.csv
+++ b/hwy_data/_systems/fraidfd77.csv
@@ -65,7 +65,6 @@ fraidfd77;FRA-IDF;D22;-77;;;fraidf.d002277;
 fraidfd77;FRA-IDF;D22E;-77;;;fraidf.d0022e77;
 fraidfd77;FRA-IDF;D23;-77;;;fraidf.d002377;
 fraidfd77;FRA-IDF;D24;-77;;;fraidf.d002477;
-fraidfd77;FRA-IDF;D24E;-77;;;fraidf.d0024e77;
 fraidfd77;FRA-IDF;D25;-77;;;fraidf.d002577;
 fraidfd77;FRA-IDF;D26;-77;;;fraidf.d002677;
 fraidfd77;FRA-IDF;D26A;-77;;;fraidf.d0026a77;
@@ -176,7 +175,8 @@ fraidfd77;FRA-IDF;D62E;-77;;;fraidf.d0062e77;
 fraidfd77;FRA-IDF;D63;-77;;;fraidf.d006377;
 fraidfd77;FRA-IDF;D63A;-77;;;fraidf.d0063a77;
 fraidfd77;FRA-IDF;D63D;-77;;;fraidf.d0063d77;
-fraidfd77;FRA-IDF;D63E;-77;;;fraidf.d0063e77;
+fraidfd77;FRA-IDF;D63E1;-77;;;fraidf.d0063e177;
+fraidfd77;FRA-IDF;D63E2;-77;;;fraidf.d0063e277;
 fraidfd77;FRA-IDF;D64;-77;;;fraidf.d006477;
 fraidfd77;FRA-IDF;D65;-77;;;fraidf.d006577;
 fraidfd77;FRA-IDF;D66;-77;;;fraidf.d006677;
diff --git a/hwy_data/_systems/fraidfd77_con.csv b/hwy_data/_systems/fraidfd77_con.csv
index eddc265f685..daa3be88860 100644
--- a/hwy_data/_systems/fraidfd77_con.csv
+++ b/hwy_data/_systems/fraidfd77_con.csv
@@ -63,7 +63,6 @@ fraidfd77;D22;-77;;fraidf.d002277
 fraidfd77;D22E;-77;;fraidf.d0022e77
 fraidfd77;D23;-77;;fraidf.d002377
 fraidfd77;D24;-77;;fraidf.d002477
-fraidfd77;D24E;-77;;fraidf.d0024e77
 fraidfd77;D25;-77;;fraidf.d002577
 fraidfd77;D26;-77;;fraidf.d002677
 fraidfd77;D26A;-77;;fraidf.d0026a77
@@ -172,7 +171,8 @@ fraidfd77;D62E;-77;;fraidf.d0062e77
 fraidfd77;D63;-77;;fraidf.d006377
 fraidfd77;D63A;-77;;fraidf.d0063a77
 fraidfd77;D63D;-77;;fraidf.d0063d77
-fraidfd77;D63E;-77;;fraidf.d0063e77
+fraidfd77;D63E1;-77;;fraidf.d0063e177
+fraidfd77;D63E2;-77;;fraidf.d0063e277
 fraidfd77;D64;-77;;fraidf.d006477
 fraidfd77;D65;-77;;fraidf.d006577
 fraidfd77;D66;-77;;fraidf.d006677
diff --git a/updates.csv b/updates.csv
index ba487d80a96..e3cae6d9d5a 100644
--- a/updates.csv
+++ b/updates.csv
@@ -1796,6 +1796,10 @@ date;region;route;root;description
 2015-09-09;(France) Hauts-de-France;Boulevard Péripherique Est de Lille;frahdf.m065159;New Route
 2015-09-09;(France) Hauts-de-France;Rocade Nord Ouest, Lille;frahdf.m065259;New Route
 2015-09-09;(France) Hauts-de-France;Voie Rapide Urbane, Roubaix;frahdf.m065659;New Route
+2026-09-08;(France) Île-de-France;D63E-77;;Route deleted, split into D63E1-77 and D63E2-77
+2026-09-08;(France) Île-de-France;D63E1-77;fraidf.d0063e177;New Route
+2026-09-08;(France) Île-de-France;D63E2-77;fraidf.d0063e277;New Route
+2026-09-08;(France) Île-de-France;D24E-77;;Route deleted
 2026-09-07;(France) Île-de-France;D9-77;fraidf.d000977;Route relocated from Rue de l'Inte and Avenue du Montboulon, and onto Route de Montgé, Route de Dammartin and Avenue du Maréchal Gallieni through Saint-Soupplets from west of the village to N330
 2026-09-07;(France) Île-de-France;D16A-77;fraidf.d0016a77;Route truncated at north end from Mainbervilliers to Boissy-aux-Cailles
 2026-09-07;(France) Île-de-France;D17A-77 (Germigny-sous-Coulombs);fraidf.d0017a377;Route renamed to D17A3-77