diff --git a/hwy_data/IND-AP/indnh/indap.nam.wpt b/hwy_data/IND-AP/indnh/indap.nam.wpt
new file mode 100644
index 00000000000..cb7e1329874
--- /dev/null
+++ b/hwy_data/IND-AP/indnh/indap.nam.wpt
@@ -0,0 +1,16 @@
+TG/AP http://www.openstreetmap.org/?lat=16.682363&lon=79.657488
+NH167AD http://www.openstreetmap.org/?lat=16.601094&lon=79.725380
+KarDacRd http://www.openstreetmap.org/?lat=16.593711&lon=79.740314
+DacTanRd http://www.openstreetmap.org/?lat=16.592889&lon=79.742460
+BraRegRd http://www.openstreetmap.org/?lat=16.521950&lon=79.834685
+Piduguralla http://www.openstreetmap.org/?lat=16.486995&lon=79.891634
+NH167AG http://www.openstreetmap.org/?lat=16.461254&lon=79.918499
+NH167A_S http://www.openstreetmap.org/?lat=16.338055&lon=79.949055
+NH544D/544F http://www.openstreetmap.org/?lat=16.119007&lon=79.929485
+KotElcRd http://www.openstreetmap.org/?lat=16.080908&lon=79.929056
+PPPRd_E http://www.openstreetmap.org/?lat=16.030326&lon=79.941545
+PPPRd_W http://www.openstreetmap.org/?lat=16.028759&lon=79.942017
+VinKopRd http://www.openstreetmap.org/?lat=15.944288&lon=79.954891
+AddSanRd http://www.openstreetmap.org/?lat=15.818247&lon=79.971328
+AddKonRd http://www.openstreetmap.org/?lat=15.815027&lon=79.971414
+NH16 http://www.openstreetmap.org/?lat=15.735526&lon=80.014329
\ No newline at end of file
diff --git a/hwy_data/IND-BR/indnh/indbr.nh027.wpt b/hwy_data/IND-BR/indnh/indbr.nh027.wpt
index c8e241c84ec..226ddc17ae3 100644
--- a/hwy_data/IND-BR/indnh/indbr.nh027.wpt
+++ b/hwy_data/IND-BR/indnh/indbr.nh027.wpt
@@ -130,4 +130,4 @@ NH131A http://www.openstreetmap.org/?lat=25.791854&lon=87.543011
 ca http://www.openstreetmap.org/?lat=25.824153&lon=87.656479
 cb http://www.openstreetmap.org/?lat=25.864167&lon=87.748146
 NH12 http://www.openstreetmap.org/?lat=25.888058&lon=87.823361
-BR/WB http://www.openstreetmap.org/?lat=25.894477&lon=87.825501
+BR/WB http://www.openstreetmap.org/?lat=25.886265&lon=87.822824
diff --git a/hwy_data/IND-BR/indnh/indbr.nh031.wpt b/hwy_data/IND-BR/indnh/indbr.nh031.wpt
index ffcb210757d..8d341fcb08e 100644
--- a/hwy_data/IND-BR/indnh/indbr.nh031.wpt
+++ b/hwy_data/IND-BR/indnh/indbr.nh031.wpt
@@ -24,4 +24,4 @@ NH231_E http://www.openstreetmap.org/?lat=25.620865&lon=87.399673
 NH131_W http://www.openstreetmap.org/?lat=25.557174&lon=87.556486
 NH131 http://www.openstreetmap.org/?lat=25.554115&lon=87.559190
 NH131_E http://www.openstreetmap.org/?lat=25.431726&lon=87.753983
-BR/WB http://www.openstreetmap.org/?lat=25.409671&lon=87.775955
+BR/WB http://www.openstreetmap.org/?lat=25.428712&lon=87.771063
diff --git a/hwy_data/IND-BR/indnh/indbr.nh031dig.wpt b/hwy_data/IND-BR/indnh/indbr.nh031dig.wpt
new file mode 100644
index 00000000000..01061fc707b
--- /dev/null
+++ b/hwy_data/IND-BR/indnh/indbr.nh031dig.wpt
@@ -0,0 +1,2 @@
+WB/BR http://www.openstreetmap.org/?lat=25.395371&lon=87.767683
+BR/WB http://www.openstreetmap.org/?lat=25.394092&lon=87.768370
\ No newline at end of file
diff --git a/hwy_data/IND-BR/indnh/indbr.nh031dil.wpt b/hwy_data/IND-BR/indnh/indbr.nh031dil.wpt
new file mode 100644
index 00000000000..6e6fa2a2aa8
--- /dev/null
+++ b/hwy_data/IND-BR/indnh/indbr.nh031dil.wpt
@@ -0,0 +1,2 @@
+WB/BR http://www.openstreetmap.org/?lat=25.404312&lon=87.772415
+BR/WB http://www.openstreetmap.org/?lat=25.399001&lon=87.768252
\ No newline at end of file
diff --git a/hwy_data/IND-BR/indnh/indbr.nh131adig.wpt b/hwy_data/IND-BR/indnh/indbr.nh131adig.wpt
new file mode 100644
index 00000000000..01061fc707b
--- /dev/null
+++ b/hwy_data/IND-BR/indnh/indbr.nh131adig.wpt
@@ -0,0 +1,2 @@
+WB/BR http://www.openstreetmap.org/?lat=25.395371&lon=87.767683
+BR/WB http://www.openstreetmap.org/?lat=25.394092&lon=87.768370
\ No newline at end of file
diff --git a/hwy_data/IND-BR/indnh/indbr.nh131adil.wpt b/hwy_data/IND-BR/indnh/indbr.nh131adil.wpt
new file mode 100644
index 00000000000..6e6fa2a2aa8
--- /dev/null
+++ b/hwy_data/IND-BR/indnh/indbr.nh131adil.wpt
@@ -0,0 +1,2 @@
+WB/BR http://www.openstreetmap.org/?lat=25.404312&lon=87.772415
+BR/WB http://www.openstreetmap.org/?lat=25.399001&lon=87.768252
\ No newline at end of file
diff --git a/hwy_data/IND-HR/indnh/indhr.nh334amb.wpt b/hwy_data/IND-HR/indnh/indhr.nh334amb.wpt
new file mode 100644
index 00000000000..45df5a02f4c
--- /dev/null
+++ b/hwy_data/IND-HR/indnh/indhr.nh334amb.wpt
@@ -0,0 +1,3 @@
+NH44/152 http://www.openstreetmap.org/?lat=30.375152&lon=76.796408
+NH152 http://www.openstreetmap.org/?lat=30.390738&lon=76.791387
+HR/PB http://www.openstreetmap.org/?lat=30.410708&lon=76.873698
diff --git a/hwy_data/IND-KA/indka/indka.ka098.wpt b/hwy_data/IND-KA/indka/indka.ka098.wpt
index cde700fe171..c7fb8dee9e5 100644
--- a/hwy_data/IND-KA/indka/indka.ka098.wpt
+++ b/hwy_data/IND-KA/indka/indka.ka098.wpt
@@ -1,4 +1,4 @@
-MH/KA http://www.openstreetmap.org/?lat=16.470215&lon=74.290946
+MH/KA http://www.openstreetmap.org/?lat=16.470174&lon=74.290967
 NH48 http://www.openstreetmap.org/?lat=16.474876&lon=74.344954
 KA78 http://www.openstreetmap.org/?lat=16.601104&lon=74.505415
-KA/MH http://www.openstreetmap.org/?lat=16.628646&lon=74.544296
+KA/MH http://www.openstreetmap.org/?lat=16.628585&lon=74.544296
diff --git a/hwy_data/IND-KA/indnh/indka.ka098.wpt b/hwy_data/IND-KA/indnh/indka.ka098.wpt
deleted file mode 100644
index c7fb8dee9e5..00000000000
--- a/hwy_data/IND-KA/indnh/indka.ka098.wpt
+++ /dev/null
@@ -1,4 +0,0 @@
-MH/KA http://www.openstreetmap.org/?lat=16.470174&lon=74.290967
-NH48 http://www.openstreetmap.org/?lat=16.474876&lon=74.344954
-KA78 http://www.openstreetmap.org/?lat=16.601104&lon=74.505415
-KA/MH http://www.openstreetmap.org/?lat=16.628585&lon=74.544296
diff --git a/hwy_data/IND-MH/indnh/indmh.nh044.wpt b/hwy_data/IND-MH/indnh/indmh.nh044.wpt
new file mode 100644
index 00000000000..04c46da1455
--- /dev/null
+++ b/hwy_data/IND-MH/indnh/indmh.nh044.wpt
@@ -0,0 +1,14 @@
+TG/MH http://www.openstreetmap.org/?lat=19.817391&lon=78.577523
+MH234_W http://www.openstreetmap.org/?lat=19.832480&lon=78.569670
+MH234_E http://www.openstreetmap.org/?lat=19.868324&lon=78.570271
+MH233_W http://www.openstreetmap.org/?lat=20.000441&lon=78.534629
+MH233_E http://www.openstreetmap.org/?lat=20.003102&lon=78.534908
+NH930 http://www.openstreetmap.org/?lat=20.137947&lon=78.623486
+MH236 http://www.openstreetmap.org/?lat=20.276167&lon=78.716955
+NH361B http://www.openstreetmap.org/?lat=20.280917&lon=78.719358
+NH347A_W http://www.openstreetmap.org/?lat=20.545968&lon=78.809309
+NH347A_E http://www.openstreetmap.org/?lat=20.616618&lon=78.931060
+MH258 http://www.openstreetmap.org/?lat=20.646780&lon=78.926382
+NH361 http://www.openstreetmap.org/?lat=20.911437&lon=78.989596
+MH262 http://www.openstreetmap.org/?lat=20.919976&lon=78.996205
+NH44/44W_S http://www.openstreetmap.org/?lat=21.023063&lon=79.049721
diff --git a/hwy_data/IND-UP/indnh/indup.nh135bg.wpt b/hwy_data/IND-UP/indnh/indup.nh135bg.wpt
new file mode 100644
index 00000000000..66001d5d15f
--- /dev/null
+++ b/hwy_data/IND-UP/indnh/indup.nh135bg.wpt
@@ -0,0 +1,2 @@
+NH35 http://www.openstreetmap.org/?lat=25.216745&lon=80.879760
+UP/MP http://www.openstreetmap.org/?lat=25.175981&lon=80.868323
diff --git a/hwy_data/IND-WB/indnh/indwb.nh012.wpt b/hwy_data/IND-WB/indnh/indwb.nh012.wpt
index afd5fbe5179..6e25ebf916d 100644
--- a/hwy_data/IND-WB/indnh/indwb.nh012.wpt
+++ b/hwy_data/IND-WB/indnh/indwb.nh012.wpt
@@ -126,8 +126,8 @@ WBUniT http://www.openstreetmap.org/?lat=22.957030&lon=88.544698
 IISERKConRd http://www.openstreetmap.org/?lat=22.960804&lon=88.544891
 RinaRd http://www.openstreetmap.org/?lat=22.967837&lon=88.545685
 ShiRd http://www.openstreetmap.org/?lat=22.986210&lon=88.546157
-WB1_W http://www.openstreetmap.org/?lat=22.993834&lon=88.545084
-+x5 http://www.openstreetmap.org/?lat=23.009201&lon=88.532896
+WB1_W http://www.openstreetmap.org/?lat=22.993790&lon=88.544923
++x1(WB1) http://www.openstreetmap.org/?lat=23.009201&lon=88.532896
 SimKalRd http://www.openstreetmap.org/?lat=23.033630&lon=88.534827
 PalStaRd http://www.openstreetmap.org/?lat=23.055765&lon=88.540449
 ChaNimRd http://www.openstreetmap.org/?lat=23.073178&lon=88.543282
@@ -149,7 +149,7 @@ FBSTHRd http://www.openstreetmap.org/?lat=23.226440&lon=88.496461
 FulRd http://www.openstreetmap.org/?lat=23.228569&lon=88.493714
 KitRd http://www.openstreetmap.org/?lat=23.232000&lon=88.481269
 SanMunHwy_S http://www.openstreetmap.org/?lat=23.233656&lon=88.467665
-+x6 http://www.openstreetmap.org/?lat=23.255364&lon=88.464768
++x5 http://www.openstreetmap.org/?lat=23.255364&lon=88.464768
 SanRd_Sha http://www.openstreetmap.org/?lat=23.266053&lon=88.448085
 SanMunHwy_N http://www.openstreetmap.org/?lat=23.269104&lon=88.437152
 SanMorRd http://www.openstreetmap.org/?lat=23.277629&lon=88.433011
@@ -162,7 +162,7 @@ JalStaRd http://www.openstreetmap.org/?lat=23.361463&lon=88.477793
 WB11_S http://www.openstreetmap.org/?lat=23.382480&lon=88.488436
 KriRd_N http://www.openstreetmap.org/?lat=23.385001&lon=88.489337
 WB8 http://www.openstreetmap.org/?lat=23.401052&lon=88.474102
-+x7 http://www.openstreetmap.org/?lat=23.406910&lon=88.475454
++x6 http://www.openstreetmap.org/?lat=23.406910&lon=88.475454
 MMGhoSt http://www.openstreetmap.org/?lat=23.409071&lon=88.473882
 BhaSarMarg http://www.openstreetmap.org/?lat=23.459487&lon=88.454511
 HanMore http://www.openstreetmap.org/?lat=23.463994&lon=88.452795
@@ -200,10 +200,10 @@ BhaStaRd http://www.openstreetmap.org/?lat=23.988453&lon=88.240600
 SarStaRd http://www.openstreetmap.org/?lat=24.016636&lon=88.248882
 KaziNazSar http://www.openstreetmap.org/?lat=24.031845&lon=88.246307
 BehByp_S http://www.openstreetmap.org/?lat=24.047370&lon=88.247638
-+x8 http://www.openstreetmap.org/?lat=24.052597&lon=88.249698
++x7 http://www.openstreetmap.org/?lat=24.052597&lon=88.249698
 SwaAkhSar http://www.openstreetmap.org/?lat=24.061023&lon=88.238711
 KhaChoRd http://www.openstreetmap.org/?lat=24.075678&lon=88.222489
-+x9 http://www.openstreetmap.org/?lat=24.096481&lon=88.212190
++x8 http://www.openstreetmap.org/?lat=24.096481&lon=88.212190
 BehByp_N http://www.openstreetmap.org/?lat=24.125150&lon=88.217661
 NarRd_Nar http://www.openstreetmap.org/?lat=24.176923&lon=88.157473
 PNLRd http://www.openstreetmap.org/?lat=24.186867&lon=88.146164
@@ -214,37 +214,37 @@ ImaRd http://www.openstreetmap.org/?lat=24.281702&lon=88.051890
 DohDanRd http://www.openstreetmap.org/?lat=24.288650&lon=88.043404
 NH14 http://www.openstreetmap.org/?lat=24.300248&lon=88.031666
 BahNagRd http://www.openstreetmap.org/?lat=24.309771&lon=88.028769
-+x9a http://www.openstreetmap.org/?lat=24.323772&lon=88.025122
++x8a http://www.openstreetmap.org/?lat=24.323772&lon=88.025122
 EJ26 http://www.openstreetmap.org/?lat=24.366566&lon=88.039080
-+x9b http://www.openstreetmap.org/?lat=24.376495&lon=88.042374
-+x10 http://www.openstreetmap.org/?lat=24.412433&lon=88.033490
++x8b http://www.openstreetmap.org/?lat=24.376495&lon=88.042374
++x9 http://www.openstreetmap.org/?lat=24.412433&lon=88.033490
 NH312 http://www.openstreetmap.org/?lat=24.451213&lon=88.037406
-+x11 http://www.openstreetmap.org/?lat=24.478605&lon=88.032954
-+x12 http://www.openstreetmap.org/?lat=24.483956&lon=88.035657
++x10 http://www.openstreetmap.org/?lat=24.478605&lon=88.032954
++x11 http://www.openstreetmap.org/?lat=24.483956&lon=88.035657
 PanRd http://www.openstreetmap.org/?lat=24.502828&lon=88.029327
 AhlRd http://www.openstreetmap.org/?lat=24.519287&lon=88.036623
-+x13 http://www.openstreetmap.org/?lat=24.525788&lon=88.037095
-+x14 http://www.openstreetmap.org/?lat=24.532503&lon=88.028555
++x12 http://www.openstreetmap.org/?lat=24.525788&lon=88.037095
++x13 http://www.openstreetmap.org/?lat=24.532503&lon=88.028555
 KiaRd http://www.openstreetmap.org/?lat=24.536388&lon=88.028641
-+x15 http://www.openstreetmap.org/?lat=24.543493&lon=88.034799
-+x16 http://www.openstreetmap.org/?lat=24.554677&lon=88.021560
++x14 http://www.openstreetmap.org/?lat=24.543493&lon=88.034799
++x15 http://www.openstreetmap.org/?lat=24.554677&lon=88.021560
 SutiLinkRd_S http://www.openstreetmap.org/?lat=24.570621&lon=88.019028
 AzadNagRd http://www.openstreetmap.org/?lat=24.598914&lon=88.012333
 SutiLinkRd_N http://www.openstreetmap.org/?lat=24.623065&lon=87.995853
 NimMainRd_S http://www.openstreetmap.org/?lat=24.633087&lon=87.987823
 IdgMaiRd http://www.openstreetmap.org/?lat=24.635169&lon=87.978837
-+x17 http://www.openstreetmap.org/?lat=24.639001&lon=87.959375
++x16 http://www.openstreetmap.org/?lat=24.639001&lon=87.959375
 NH133A http://www.openstreetmap.org/?lat=24.656807&lon=87.943068
 NimMainRd_N http://www.openstreetmap.org/?lat=24.664061&lon=87.939935
 AnkRd http://www.openstreetmap.org/?lat=24.679719&lon=87.925344
 JigKul http://www.openstreetmap.org/?lat=24.697948&lon=87.921867
 GopNagRd http://www.openstreetmap.org/?lat=24.715278&lon=87.916846
 KhoBrg http://www.openstreetmap.org/?lat=24.725238&lon=87.915473
-+x18 http://www.openstreetmap.org/?lat=24.768382&lon=87.912169
++x17 http://www.openstreetmap.org/?lat=24.768382&lon=87.912169
 NH33 http://www.openstreetmap.org/?lat=24.780111&lon=87.916610
 KhuRd http://www.openstreetmap.org/?lat=24.788985&lon=87.915409
-+x19 http://www.openstreetmap.org/?lat=24.793884&lon=87.916803
-+x20 http://www.openstreetmap.org/?lat=24.804178&lon=87.948861
++x18 http://www.openstreetmap.org/?lat=24.793884&lon=87.916803
++x19 http://www.openstreetmap.org/?lat=24.804178&lon=87.948861
 ChakSedRd http://www.openstreetmap.org/?lat=24.816186&lon=87.961822
 17MileRd http://www.openstreetmap.org/?lat=24.831459&lon=87.974138
 16MileRd http://www.openstreetmap.org/?lat=24.841483&lon=87.982421
@@ -289,23 +289,23 @@ GokRd_N http://www.openstreetmap.org/?lat=25.380575&lon=88.162193
 NomRd http://www.openstreetmap.org/?lat=25.399786&lon=88.168266
 HarRd http://www.openstreetmap.org/?lat=25.405775&lon=88.170862
 PatRd http://www.openstreetmap.org/?lat=25.454357&lon=88.173523
-+x20a http://www.openstreetmap.org/?lat=25.488801&lon=88.177128
++x19a http://www.openstreetmap.org/?lat=25.488801&lon=88.177128
 KunRd http://www.openstreetmap.org/?lat=25.530321&lon=88.153492
 SwaTemRd http://www.openstreetmap.org/?lat=25.538685&lon=88.149104
 RalByp_S http://www.openstreetmap.org/?lat=25.571009&lon=88.132555
-+x21 http://www.openstreetmap.org/?lat=25.576918&lon=88.128676
-+x22 http://www.openstreetmap.org/?lat=25.576724&lon=88.113742
-+x23 http://www.openstreetmap.org/?lat=25.592014&lon=88.097563
-+x24 http://www.openstreetmap.org/?lat=25.626611&lon=88.102198
++x20 http://www.openstreetmap.org/?lat=25.576918&lon=88.128676
++x21 http://www.openstreetmap.org/?lat=25.576724&lon=88.113742
++x22 http://www.openstreetmap.org/?lat=25.592014&lon=88.097563
++x23 http://www.openstreetmap.org/?lat=25.626611&lon=88.102198
 LahRd http://www.openstreetmap.org/?lat=25.642116&lon=88.094645
 RajByp_N http://www.openstreetmap.org/?lat=25.654194&lon=88.091158
 ArtRd http://www.openstreetmap.org/?lat=25.681137&lon=88.073444
-+x25 http://www.openstreetmap.org/?lat=25.697864&lon=88.051128
-+x26 http://www.openstreetmap.org/?lat=25.704239&lon=88.050131
++x24 http://www.openstreetmap.org/?lat=25.697864&lon=88.051128
++x25 http://www.openstreetmap.org/?lat=25.704239&lon=88.050131
 BotRasRd http://www.openstreetmap.org/?lat=25.715747&lon=88.021581
 BR98 +BalRd http://www.openstreetmap.org/?lat=25.761267&lon=87.957809
 PanRd_Sal http://www.openstreetmap.org/?lat=25.791661&lon=87.925816
 KarByp_S http://www.openstreetmap.org/?lat=25.799787&lon=87.920419
-+x27 http://www.openstreetmap.org/?lat=25.807097&lon=87.910881
++x26 http://www.openstreetmap.org/?lat=25.807097&lon=87.910881
 WB/BR http://www.openstreetmap.org/?lat=25.815080&lon=87.909293
 
diff --git a/hwy_data/IND-WB/indnh/indwb.nh112.wpt b/hwy_data/IND-WB/indnh/indwb.nh112.wpt
index 03b6023b1e4..41a3b9041be 100644
--- a/hwy_data/IND-WB/indnh/indwb.nh112.wpt
+++ b/hwy_data/IND-WB/indnh/indwb.nh112.wpt
@@ -36,4 +36,4 @@ WB2_E http://www.openstreetmap.org/?lat=22.719349&lon=88.486687
 WB2_W http://www.openstreetmap.org/?lat=22.719180&lon=88.485528
 ChoParaRd http://www.openstreetmap.org/?lat=22.712936&lon=88.480791
 KNCRd_S http://www.openstreetmap.org/?lat=22.711392&lon=88.478817
-NH12/WB1 http://www.openstreetmap.org/?lat=22.711382&lon=88.475486
+NH12 http://www.openstreetmap.org/?lat=22.711382&lon=88.475486
diff --git a/hwy_data/_systems/indah_con.csv b/hwy_data/_systems/indah_con.csv
index 5da43c8aa35..c8cab078548 100644
--- a/hwy_data/_systems/indah_con.csv
+++ b/hwy_data/_systems/indah_con.csv
@@ -1,4 +1,3 @@
-
 systemName;route;banner;groupName;roots
 indah;AH1;;;indwb.ah001
 indah;AH2;;;indwb.ah002
diff --git a/hwy_data/_systems/indnh.csv b/hwy_data/_systems/indnh.csv
index bd5b0be9be3..7892004db81 100644
--- a/hwy_data/_systems/indnh.csv
+++ b/hwy_data/_systems/indnh.csv
@@ -1,20 +1,22 @@
-systemName;region;route;banner;abbrev;city;root
+#systemName;region;route;banner;abbrev;city;root
 indnh;IND-TG;NAM;;;Narketpally-Addanki-Medarmetla Road;indtg.nam;
+indnh;IND-AP;NAM;;;Narketpally-Addanki-Medarmetia Road;indap.nam;
 indnh;IND-PB;NH9;;;;indpb.nh009;
-indnh;IND-HR;NH9;;;;indhr.nh009;
+indnh;IND-HR;NH9;;;Sirsa-Rohtak;indhr.nh009;
 indnh;IND-DL;NH9;;jha;Jharoda Kalan New Delhi;inddl.nh009jha;
 indnh;IND-HR;NH9;;bah;Bahadurgarh;indhr.nh009bah;
 indnh;IND-DL;NH9;;;;inddl.nh009;
-indnh;IND-UP;NH9;;;;indup.nh009;
+indnh;IND-UP;NH9;;;Ghaziabad-Moradabad;indup.nh009;
 indnh;IND-UT;NH9;;rud;Rudrapur;indut.nh009rud;
 indnh;IND-UP;NH9;;bah;Baheri;indup.nh009bah;
 indnh;IND-UT;NH9;;bar;Bara;indut.nh009bar;
 indnh;IND-UP;NH9;;bar;Bareilly District;indup.nh009bar;
-indnh;IND-UT;NH9;;;;indut.nh009;
+indnh;IND-UT;NH9;;;Sitarganj-Dharchula;indut.nh009;
 indnh;IND-WB;NH10;;;;indwb.nh010;
 indnh;IND-SK;NH10;;;;indsk.nh010;
-indnh;IND-WB;NH12;;;;indwb.nh012;
-indnh;IND-BR;NH12;;;;indbr.nh012;
+indnh;IND-WB;NH12;;;Sundarbans-Kolkata-Malda;indwb.nh012;
+indnh;IND-BR;NH12;;;Birnagar;indbr.nh012;
+indnh;IND-WB;NH12;;dal;Dalkhola;indwb.nh012dal;fs
 indnh;IND-WB;NH14;;;;indwb.nh014;
 indnh;IND-WB;NH16;;;;indwb.nh016;
 indnh;IND-OR;NH16;;;Cuttack;indor.nh016;
@@ -49,19 +51,11 @@ indnh;IND-RJ;NH27;;;;indrj.nh027;
 indnh;IND-MP;NH27;;;;indmp.nh027;
 indnh;IND-UP;NH27;;;;indup.nh027;
 indnh;IND-BR;NH27;;;Golpalgamj-Purnia;indbr.nh027;
-indnh;IND-WB;NH27;;Sur;Surja Kama;indwb.nh027sur;
-indnh;IND-BR;NH27;;Ang;Angia;indbr.nh027ang;
-indnh;IND-WB;NH27;;Kan;Kanki-Hatwar;indwb.nh027kan;
-indnh;IND-BR;NH27;;Sam;Samda;indbr.nh027sam;
-indnh;IND-WB;NH27;;Cha;Chanpur;indwb.nh027cha;
+indnh;IND-WB;NH27;;Dal;Dalkola;indwb.nh027dal;
+indnh;IND-BR;NH27;;Dal;Dalkola, West Bengal;indbr.nh027dal;
+indnh;IND-WB;NH27;;Nay;Nayanagar;indwb.nh027nay;
 indnh;IND-BR;NH27;;Kis;Kishanganj;indbr.nh027kis;
-indnh;IND-WB;NH27;;Pan;Panjipara-Gunjara;indwb.nh027pan;
-indnh;IND-BR;NH27;;Pot;Pothia;indbr.nh027pot;
-indnh;IND-WB;NH27;;Isl;Islampur;indwb.nh027isl;
-indnh;IND-BR;NH27;;Isl;Islampur;indbr.nh027isl;
-indnh;IND-WB;NH27;;Ram;Ramganj;indwb.nh027ram;
-indnh;IND-BR;NH27;;Ram;Ramganj;indbr.nh027ram;
-indnh;IND-WB;NH27;;;Bagadora-Alipurduar;indwb.nh027;
+indnh;IND-WB;NH27;;;Islampur-Alipurduar;indwb.nh027;
 indnh;IND-AS;NH27;;Guw;Guwahati;indas.nh027guw;
 indnh;IND-MG;NH27;;ooa;Meghalaya Border Jump A;indmg.nh027ooa;
 indnh;IND-AS;NH27;;ooa;Assam Border Jump A;indas.nh027ooa;
@@ -85,7 +79,11 @@ indnh;IND-MP;NH30;;;;indmp.nh030;
 indnh;IND-UP;NH30;;;;indup.nh030;
 indnh;IND-UP;NH31;;;;indup.nh031;
 indnh;IND-BR;NH31;;;;indbr.nh031;
-indnh;IND-WB;NH31;;;;indwb.nh031;
+indnh;IND-WB;NH31;;sar;Saraha Bahara;indwb.nh031sar;
+indnh;IND-BR;NH31;;dil;Dilli Diwanganj;indbr.nh031dil;
+indnh;IND-WB;NH31;;naw;Nawapara;indwb.nh031naw;
+indnh;IND-BR;NH31;;dig;Digri Inlis, West Bengal;indbr.nh031dig;
+indnh;IND-WB;NH31;;;Digri Inlis-Sahapur;indwb.nh031;
 indnh;IND-BR;NH33;;;;indbr.nh033;
 indnh;IND-JH;NH33;;;;indjh.nh033;
 indnh;IND-WB;NH33;;;;indwb.nh033;
@@ -122,6 +120,7 @@ indnh;IND-TN;NH44;;;;indtn.nh044;
 indnh;IND-KA;NH44;;;;indka.nh044;
 indnh;IND-AP;NH44;;;;indap.nh044;
 indnh;IND-TG;NH44;;;;indtg.nh044;
+indnh;IND-MH;NH44;;;Pandharkawada;indmh.nh044;
 indnh;IND-MH;NH44W;;nag;Nagpur;indmh.nh044wnag;
 indnh;IND-MH;NH44E;;nag;Mumbai-Kolkata Highway;indmh.nh044enag;
 indnh;IND-MH;NH44;;ama;Amadi;indmh.nh044ama;
@@ -167,6 +166,7 @@ indnh;IND-HR;NH48;;;;indhr.nh048;
 indnh;IND-DL;NH48;;;;inddl.nh048;
 indnh;IND-CG;NH49;;;;indcg.nh049;
 indnh;IND-OR;NH49;;;;indor.nh049;
+indnh;IND-JH;NH49;;;;indjh.nh049;
 indnh;IND-WB;NH49;;;;indwb.nh049;
 indnh;IND-KA;NH50;;;;indka.nh050;
 indnh;IND-KA;NH50W;;kal;Kalaburagi;indka.nh050wkal;
@@ -175,6 +175,7 @@ indnh;IND-KA;NH50;;bid;Bidar;indka.nh050bid;
 indnh;IND-MH;NH50;;;;indmh.nh050;
 indnh;IND-KA;NH52;;;;indka.nh052;
 indnh;IND-MH;NH52;;;;indmh.nh052;
+indnh;IND-MP;NH52;;;;indmp.nh052;
 indnh;IND-RJ;NH52;;;;indrj.nh052;
 indnh;IND-HR;NH52;;;;indhr.nh052;
 indnh;IND-MH;NH61;;;;indmh.nh061;
@@ -195,7 +196,7 @@ indnh;IND-KL;NH66;;;Kochi;indkl.nh066;
 indnh;IND-PY;NH66;;;;indpy.nh066;
 indnh;IND-KL;NH66;;kan;Kannur;indkl.nh066kan;
 indnh;IND-KA;NH66;;;;indka.nh066;
-indnh;IND-GA;NH66;;;;indga.nh066;
+indnh;IND-GA;NH66;;;;indga.nh066;fs
 indnh;IND-MH;NH66;;;;indmh.nh066;
 indnh;IND-KA;NH67;;;;indka.nh067;
 indnh;IND-AP;NH67;;;;indap.nh067;
@@ -226,8 +227,12 @@ indnh;IND-UP;NH128;;;;indup.nh128;
 indnh;IND-UP;NH128A;;;;indup.nh128a;
 indnh;IND-UP;NH128B;;;;indup.nh128b;
 indnh;IND-UP;NH128C;;;;indup.nh128c;
-indnh;IND-WB;NH131A;;;;indwb.nh131a;
 indnh;IND-BR;NH131A;;;;indbr.nh131a;
+indnh;IND-WB;NH131A;;sar;Saraha Bahara;indwb.nh131asar;
+indnh;IND-BR;NH131A;;dil;Dilli Diwanganj;indbr.nh131adil;
+indnh;IND-WB;NH131A;;naw;Nawapara;indwb.nh131anaw;
+indnh;IND-BR;NH131A;;dig;Digri Inlis, West Bengal;indbr.nh131adig;
+indnh;IND-WB;NH131A;;;Digri Inlis-Sahapur;indwb.nh131a;
 indnh;IND-JH;NH133A;;;;indjh.nh133a;
 indnh;IND-WB;NH133A;;;;indwb.nh133a;
 indnh;IND-UP;NH135;;;;indup.nh135;
@@ -237,6 +242,7 @@ indnh;IND-UP;NH135BB;;bar;Bargarh;indup.nh135bbbar;
 indnh;IND-MP;NH135BB;;mag;Magdaur;indmp.nh135bbmag;
 indnh;IND-UP;NH135BB;;chi;Chitrakoot District;indup.nh135bbchi;
 indnh;IND-MP;NH135BB;;dab;Dabhaur;indmp.nh135bbdab;
+indnh;IND-UP;NH135BG;;;;indup.nh135bg;
 indnh;IND-UP;NH135C;;;;indup.nh135c;
 indnh;IND-MP;NH135C;;;;indmp.nh135c;
 indnh;IND-MH;NH150;;;;indmh.nh150;
@@ -354,8 +360,10 @@ indnh;IND-KA;NH369;;;;indka.nh369;
 indnh;IND-KA;NH369E;;;Sagara;indka.nh369e;
 indnh;IND-KA;NH369E;;lin;Linganamakki Resevoir;indka.nh369elin;
 indnh;IND-KA;NH373;;;;indka.nh373;
-indnh;IND-JH;NH419;;;;indjh.nh419;
-indnh;IND-WB;NH419;;;;indwb.nh419;
+indnh;IND-JH;NH419;;;Tilabani-Jamtara-Mihijam;indjh.nh419;
+indnh;IND-WB;NH419;;pit;Pithakiari;indwb.nh419pit;
+indnh;IND-JH;NH419;;rup;Rupnarayanpur, West Bengal;indjh.nh419rup;
+indnh;IND-WB;NH419;;;Rupnarayanpur;indwb.nh419;
 indnh;IND-UP;NH509;;;;indup.nh509;
 indnh;IND-SK;NH510;;;;indsk.nh510;
 indnh;IND-WB;NH512;;;;indwb.nh512;
diff --git a/hwy_data/_systems/indnh_con.csv b/hwy_data/_systems/indnh_con.csv
index 6b5a7d21717..8265570186a 100644
--- a/hwy_data/_systems/indnh_con.csv
+++ b/hwy_data/_systems/indnh_con.csv
@@ -1,8 +1,8 @@
 systemName;route;banner;groupName;roots
-indnh;NAM;;;indtg.nam
+indnh;NAM;;;indtg.nam,indap.nam
 indnh;NH9;;;indpb.nh009,indhr.nh009,inddl.nh009jha,indhr.nh009bah,inddl.nh009,indup.nh009,indut.nh009rud,indup.nh009bah,indut.nh009bar,indup.nh009bar,indut.nh009
 indnh;NH10;;;indwb.nh010,indsk.nh010
-indnh;NH12;;;indwb.nh012,indbr.nh012
+indnh;NH12;;;indwb.nh012,indbr.nh012,indwb.nh012dal
 indnh;NH14;;;indwb.nh014
 indnh;NH16;;;indwb.nh016,indor.nh016,indap.nh016pur,indor.nh016rer,indap.nh016ich,indor.nh016chi,indap.nh016,indtn.nh016ara,indap.nh016ram,indtn.nh016
 indnh;NH17;;;indwb.nh017,indas.nh017
@@ -11,17 +11,17 @@ indnh;NH19;;;inddl.nh019,indhr.nh019,indup.nh019,indup.nh019npha,indup.nh019var,
 indnh;NH19S;;;indup.nh019spra
 indnh;NH21;;;indrj.nh021,indup.nh021
 indnh;NH24;;;indup.nh024
-indnh;NH27;;;indgj.nh027,indrj.nh027,indmp.nh027,indup.nh027,indbr.nh027,indwb.nh027sur,indbr.nh027ang,indwb.nh027kan,indbr.nh027sam,indwb.nh027cha,indbr.nh027kis,indwb.nh027pan,indbr.nh027pot,indwb.nh027isl,indbr.nh027isl,indwb.nh027ram,indbr.nh027ram,indwb.nh027,indas.nh027guw,indmg.nh027ooa,indas.nh027ooa,indmg.nh027oob,indas.nh027oob,indmg.nh027ooc,indas.nh027
+indnh;NH27;;;indgj.nh027,indrj.nh027,indmp.nh027,indup.nh027,indbr.nh027,indwb.nh027dal,indbr.nh027dal,indwb.nh027nay,indbr.nh027kis,indwb.nh027,indas.nh027guw,indmg.nh027ooa,indas.nh027ooa,indmg.nh027oob,indas.nh027oob,indmg.nh027ooc,indas.nh027
 indnh;NH28;;;indup.nh028
 indnh;NH30;;;indap.nh030,indtg.nh030,indap.nh030nel,indtg.nh030lax,indap.nh030eta,indtg.nh030bha,indap.nh030chi,indcg.nh030,indcg.nh030wrai,indcg.nh030rai,indmp.nh030,indup.nh030
 indnh;NH30E;;;indcg.nh030erai
-indnh;NH31;;;indup.nh031,indbr.nh031,indwb.nh031
+indnh;NH31;;;indup.nh031,indbr.nh031,indwb.nh031sar,indbr.nh031dil,indwb.nh031naw,indbr.nh031dig,indwb.nh031
 indnh;NH33;;;indbr.nh033,indjh.nh033,indwb.nh033
 indnh;NH34;;;indmp.nh034,indup.nh034,indut.nh034
 indnh;NH35;;;indup.nh035
 indnh;NH39;;;indup.nh039jha,indmp.nh039orc,indup.nh039jhd,indmp.nh039nid,indup.nh039bar,indmp.nh039niw,indup.nh039sak,indmp.nh039kal,indup.nh039bhi,indmp.nh039ghu,indup.nh039mau,indmp.nh039chh,indup.nh039mah,indmp.nh039,indup.nh039,indjh.nh039
 indnh;NH42;;;indtn.nh042,indap.nh042kup,indka.nh042kol,indap.nh042nay,indka.nh042son,indap.nh042gan,indka.nh042pan,indap.nh042,indka.nh042che
-indnh;NH44;;;indtn.nh044,indka.nh044,indap.nh044,indtg.nh044,indmh.nh044enag,indmh.nh044ama,indmp.nh044seo,indmp.nh044wseo,indmp.nh044,indup.nh044,indmp.nh044cha,indup.nh044til,indmp.nh044ban,indup.nh044jha,indmp.nh044dat,indmp.nh044edab,indmp.nh044gwa,indrj.nh044,indup.nh044jaj,indup.nh044wagr,indup.nh044mat,indhr.nh044far,inddl.nh044,indhr.nh044,indpb.nh044,indhp.nh044cha,indpb.nh044kau,indhp.nh044moh,indpb.nh044pat,indjk.nh044
+indnh;NH44;;;indtn.nh044,indka.nh044,indap.nh044,indtg.nh044,indmh.nh044,indmh.nh044enag,indmh.nh044ama,indmp.nh044seo,indmp.nh044wseo,indmp.nh044,indup.nh044,indmp.nh044cha,indup.nh044til,indmp.nh044ban,indup.nh044jha,indmp.nh044dat,indmp.nh044edab,indmp.nh044gwa,indrj.nh044,indup.nh044jaj,indup.nh044wagr,indup.nh044mat,indhr.nh044far,inddl.nh044,indhr.nh044,indpb.nh044,indhp.nh044cha,indpb.nh044kau,indhp.nh044moh,indpb.nh044pat,indjk.nh044
 indnh;NH44W;;;indmh.nh044wnag
 indnh;NH44E;;;indmp.nh044eseo
 indnh;NH44E;;;indup.nh044eagr
@@ -29,10 +29,10 @@ indnh;NH44W;;;indmp.nh044wdab
 indnh;NH48;;;indtn.nh048,indka.nh048bom,indka.nh048wben,indka.nh048,indmh.nh048,indgj.nh048vad,indgj.nh048enad,indgj.nh048,indrj.nh048,indhr.nh048,inddl.nh048
 indnh;NH48E;;;indka.nh048eben
 indnh;NH48W;;;indgj.nh048wnad
-indnh;NH49;;;indcg.nh049,indor.nh049,indwb.nh049
+indnh;NH49;;;indcg.nh049,indor.nh049,indjh.nh049,indwb.nh049
 indnh;NH50;;;indka.nh050,indka.nh050wkal,indka.nh050bid,indmh.nh050
 indnh;NH50E;;;indka.nh050ekal
-indnh;NH52;;;indka.nh052,indmh.nh052,indrj.nh052,indhr.nh052
+indnh;NH52;;;indka.nh052,indmh.nh052,indmp.nh052,indrj.nh052,indhr.nh052
 indnh;NH61;;;indmh.nh061,indtg.nh061
 indnh;NH63;;;indmh.nh063,indka.nh063,indmh.nh063deg,indtg.nh063,indmh.nh063sir,indcg.nh063,indor.nh063
 indnh;NH65;;;indmh.nh065,indka.nh065,indtg.nh065,indap.nh065
@@ -55,11 +55,12 @@ indnh;NH128;;;indup.nh128
 indnh;NH128A;;;indup.nh128a
 indnh;NH128B;;;indup.nh128b
 indnh;NH128C;;;indup.nh128c
-indnh;NH131A;;;indwb.nh131a,indbr.nh131a
+indnh;NH131A;;;indbr.nh131a,indwb.nh131asar,indbr.nh131adil,indwb.nh131anaw,indbr.nh131adig,indwb.nh131a
 indnh;NH133A;;;indjh.nh133a,indwb.nh133a
 indnh;NH135;;;indup.nh135,indmp.nh135
 indnh;NH135A;;;indup.nh135a
 indnh;NH135BB;;;indup.nh135bbbar,indmp.nh135bbmag,indup.nh135bbchi,indmp.nh135bbdab
+indnh;NH135BG;;;indup.nh135bg
 indnh;NH135C;;;indup.nh135c
 indnh;NH135C;;;indmp.nh135c
 indnh;NH150;;;indmh.nh150,indka.nh150,indtg.nh150
@@ -127,7 +128,7 @@ indnh;NH369;;;indka.nh369
 indnh;NH369E;;;indka.nh369e
 indnh;NH369E;;;indka.nh369elin
 indnh;NH373;;;indka.nh373
-indnh;NH419;;;indjh.nh419,indwb.nh419
+indnh;NH419;;;indjh.nh419,indwb.nh419pit,indjh.nh419rup,indwb.nh419
 indnh;NH509;;;indup.nh509
 indnh;NH510;;;indsk.nh510
 indnh;NH512;;;indwb.nh512