diff --git a/src/main/play/release-notes/en-US/default.txt b/src/main/play/release-notes/en-US/default.txt
index 49418d9a..45b46566 100644
--- a/src/main/play/release-notes/en-US/default.txt
+++ b/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,3 @@
-Schedule from March 24, 2024 to June 30, 2024.
+Schedule from March 31, 2024 to June 30, 2024.
 Real-time predictions from NextRide.
 Tweets from @BCTransit.
diff --git a/src/main/res-current/raw/current_gtfs_rts_stops b/src/main/res-current/raw/current_gtfs_rts_stops
index b1abddee..e246816d 100644
--- a/src/main/res-current/raw/current_gtfs_rts_stops
+++ b/src/main/res-current/raw/current_gtfs_rts_stops
@@ -65,8 +65,6 @@
 110560,'110560','Back Rd @ McDonald',49.6854,-124.95837,0,1449563551
 110561,'110561','Back Rd @ 10th St E',49.69959,-124.9762,0,1449563552
 110562,'110562','Anfield Ctr',49.66825,-124.97984,0,1449563553
-110563,'110563','Anfield Ctr',49.66824,-124.97981,0,1449563554
-110564,'110564','Downtown Courtenay',49.69254,-124.99832,0,1449563555
 110565,'110565','Cowichan @ 5th St E',49.70651,-124.96824,0,1449563556
 110566,'110566','Menzies @ 2nd St',49.68884,-125.00957,0,1449563557
 111270,'111270','Downtown Courtenay',49.69201,-124.9984,0,1449590490
diff --git a/src/main/res-current/raw/current_gtfs_rts_trip_stops b/src/main/res-current/raw/current_gtfs_rts_trip_stops
index 35c53cad..675c4860 100644
--- a/src/main/res-current/raw/current_gtfs_rts_trip_stops
+++ b/src/main/res-current/raw/current_gtfs_rts_trip_stops
@@ -72,12 +72,11 @@
 200,111502,8,0
 200,111295,9,0
 200,134006,10,0
-200,110563,11,1
-200,110562,12,1
-200,111275,13,1
-200,111277,14,0
-200,134005,15,0
-200,111278,16,1
+200,110562,11,1
+200,111275,12,1
+200,111277,13,0
+200,134005,14,0
+200,111278,15,1
 201,111275,1,0
 201,111276,2,0
 201,111507,3,0
@@ -155,7 +154,6 @@
 501,111380,2,0
 501,111489,3,0
 501,111486,4,1
-501,110564,5,1
 601,111486,1,0
 601,111381,2,0
 601,111296,3,0
@@ -299,9 +297,10 @@
 1001,103865,15,0
 1001,110493,16,0
 1001,111435,17,0
-1001,110324,18,0
-1001,111437,19,0
-1001,111438,20,1
+1001,110523,18,0
+1001,110324,19,0
+1001,111437,20,0
+1001,111438,21,1
 1100,111486,1,0
 1100,111381,2,0
 1100,111296,3,0
diff --git a/src/main/res-current/raw/current_gtfs_rts_trips b/src/main/res-current/raw/current_gtfs_rts_trips
index 2646b92d..1cc1748a 100644
--- a/src/main/res-current/raw/current_gtfs_rts_trips
+++ b/src/main/res-current/raw/current_gtfs_rts_trips
@@ -1,6 +1,6 @@
 101,0,'Anfield Ctr -',1
 100,0,'Comox Mall -',1
-200,0,'Anfield Ctr / Comox Mall',2
+200,0,'Comox Mall / Downtown',2
 201,0,'Cumberland',2
 301,0,'Comox Local',3
 400,0,'Comox Mall -',4
diff --git a/src/main/res-current/raw/current_gtfs_schedule_service_dates b/src/main/res-current/raw/current_gtfs_schedule_service_dates
index 15117582..baf62406 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,10 +1,208 @@
-'2064',20240324,1
-'2048',20240325,1
-'2048',20240326,1
-'2054',20240326,1
-'2048',20240327,1
-'2053',20240327,1
-'2048',20240328,1
-'2054',20240328,1
-'2046',20240330,1
-'2064',20240331,1
+'2047',20240331,1
+'2293',20240401,1
+'2656',20240401,1
+'2293',20240402,1
+'2430',20240402,1
+'2656',20240402,1
+'2293',20240403,1
+'2656',20240403,1
+'2658',20240403,1
+'2293',20240404,1
+'2430',20240404,1
+'2656',20240404,1
+'2089',20240405,1
+'2293',20240405,1
+'2658',20240405,1
+'2660',20240406,1
+'2661',20240407,1
+'2293',20240408,1
+'2656',20240408,1
+'2293',20240409,1
+'2430',20240409,1
+'2656',20240409,1
+'2293',20240410,1
+'2656',20240410,1
+'2658',20240410,1
+'2293',20240411,1
+'2430',20240411,1
+'2656',20240411,1
+'2089',20240412,1
+'2293',20240412,1
+'2658',20240412,1
+'2660',20240413,1
+'2661',20240414,1
+'2293',20240415,1
+'2656',20240415,1
+'2293',20240416,1
+'2430',20240416,1
+'2656',20240416,1
+'2293',20240417,1
+'2656',20240417,1
+'2658',20240417,1
+'2293',20240418,1
+'2430',20240418,1
+'2656',20240418,1
+'2089',20240419,1
+'2293',20240419,1
+'2658',20240419,1
+'2660',20240420,1
+'2661',20240421,1
+'2293',20240422,1
+'2656',20240422,1
+'2293',20240423,1
+'2430',20240423,1
+'2656',20240423,1
+'2293',20240424,1
+'2656',20240424,1
+'2658',20240424,1
+'2293',20240425,1
+'2430',20240425,1
+'2656',20240425,1
+'2089',20240426,1
+'2293',20240426,1
+'2658',20240426,1
+'2660',20240427,1
+'2661',20240428,1
+'2293',20240429,1
+'2656',20240429,1
+'2293',20240430,1
+'2430',20240430,1
+'2656',20240430,1
+'2293',20240501,1
+'2656',20240501,1
+'2658',20240501,1
+'2293',20240502,1
+'2430',20240502,1
+'2656',20240502,1
+'2089',20240503,1
+'2293',20240503,1
+'2658',20240503,1
+'2660',20240504,1
+'2661',20240505,1
+'2293',20240506,1
+'2656',20240506,1
+'2293',20240507,1
+'2430',20240507,1
+'2656',20240507,1
+'2293',20240508,1
+'2656',20240508,1
+'2658',20240508,1
+'2293',20240509,1
+'2430',20240509,1
+'2656',20240509,1
+'2089',20240510,1
+'2293',20240510,1
+'2658',20240510,1
+'2660',20240511,1
+'2661',20240512,1
+'2293',20240513,1
+'2656',20240513,1
+'2293',20240514,1
+'2430',20240514,1
+'2656',20240514,1
+'2293',20240515,1
+'2656',20240515,1
+'2658',20240515,1
+'2293',20240516,1
+'2430',20240516,1
+'2656',20240516,1
+'2089',20240517,1
+'2293',20240517,1
+'2658',20240517,1
+'2660',20240518,1
+'2661',20240519,1
+'2660',20240520,1
+'2293',20240521,1
+'2430',20240521,1
+'2656',20240521,1
+'2293',20240522,1
+'2656',20240522,1
+'2658',20240522,1
+'2293',20240523,1
+'2430',20240523,1
+'2656',20240523,1
+'2089',20240524,1
+'2293',20240524,1
+'2658',20240524,1
+'2660',20240525,1
+'2661',20240526,1
+'2293',20240527,1
+'2656',20240527,1
+'2293',20240528,1
+'2430',20240528,1
+'2656',20240528,1
+'2293',20240529,1
+'2656',20240529,1
+'2658',20240529,1
+'2293',20240530,1
+'2430',20240530,1
+'2656',20240530,1
+'2089',20240531,1
+'2293',20240531,1
+'2658',20240531,1
+'2660',20240601,1
+'2661',20240602,1
+'2293',20240603,1
+'2656',20240603,1
+'2293',20240604,1
+'2430',20240604,1
+'2656',20240604,1
+'2293',20240605,1
+'2656',20240605,1
+'2658',20240605,1
+'2293',20240606,1
+'2430',20240606,1
+'2656',20240606,1
+'2089',20240607,1
+'2293',20240607,1
+'2658',20240607,1
+'2660',20240608,1
+'2661',20240609,1
+'2293',20240610,1
+'2656',20240610,1
+'2293',20240611,1
+'2430',20240611,1
+'2656',20240611,1
+'2293',20240612,1
+'2656',20240612,1
+'2658',20240612,1
+'2293',20240613,1
+'2430',20240613,1
+'2656',20240613,1
+'2089',20240614,1
+'2293',20240614,1
+'2658',20240614,1
+'2660',20240615,1
+'2661',20240616,1
+'2293',20240617,1
+'2656',20240617,1
+'2293',20240618,1
+'2430',20240618,1
+'2656',20240618,1
+'2293',20240619,1
+'2656',20240619,1
+'2658',20240619,1
+'2293',20240620,1
+'2430',20240620,1
+'2656',20240620,1
+'2089',20240621,1
+'2293',20240621,1
+'2658',20240621,1
+'2660',20240622,1
+'2661',20240623,1
+'2293',20240624,1
+'2656',20240624,1
+'2293',20240625,1
+'2430',20240625,1
+'2656',20240625,1
+'2293',20240626,1
+'2656',20240626,1
+'2658',20240626,1
+'2293',20240627,1
+'2430',20240627,1
+'2656',20240627,1
+'2089',20240628,1
+'2293',20240628,1
+'2658',20240628,1
+'2660',20240629,1
+'2661',20240630,1
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103860 b/src/main/res-current/raw/current_gtfs_schedule_stop_103860
index f1e151df..846413bc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103860
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103860
@@ -1,2 +1,2 @@
-'2046',1201,122300,,'',0,60000,,'',0
-'2048',1201,65100,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,65100,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,122300,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103861 b/src/main/res-current/raw/current_gtfs_schedule_stop_103861
index 7b00eef3..e7e3e767 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103861
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103861
@@ -1,2 +1,2 @@
-'2046',1201,123200,,'',0,60000,,'',0
-'2048',1201,70000,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,70000,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,123200,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103862 b/src/main/res-current/raw/current_gtfs_schedule_stop_103862
index 6b7083fe..dbbe2062 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103862
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103862
@@ -1,7 +1,9 @@
-'2046',1000,102000,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75500,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114000,,'',0,68000,0,'Downtown',0
-'2054',1400,90800,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,80600,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,103300,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,4100,,'',0
-'2064',2001,125800,,'',0,20000,,'',0
+'2047',1000,114000,,'',0,68000,0,'Downtown',0
+'2293',1000,75500,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,101900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113600,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90800,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125800,,'',0,20000,,'',0
+'2293',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
+'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103863 b/src/main/res-current/raw/current_gtfs_schedule_stop_103863
index c2e7e733..feac7106 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103863
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103863
@@ -1,5 +1,6 @@
-'2046',1000,101200,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,113200,,'',0,68000,0,'Downtown',0
-'2054',1400,90000,,'',0,21400,,'',0,48600,,'',0
-'2054',1401,85200,4,'',0,25400,4,'',0,44600,4,'',0
+'2047',1000,113200,,'',0,68000,0,'Downtown',0
+'2293',1000,75700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,101100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,112800,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90000,,'',0,21400,,'',0,48600,,'',0
+'2430',1401,85200,4,'',0,25400,4,'',0,44600,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103864 b/src/main/res-current/raw/current_gtfs_schedule_stop_103864
index 6e4b328a..847621fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103864
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103864
@@ -1,3 +1,4 @@
-'2046',1000,100600,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75100,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,112600,,'',0,68000,0,'Downtown',0
+'2047',1000,112600,,'',0,68000,0,'Downtown',0
+'2293',1000,75100,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,100500,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,112200,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103865 b/src/main/res-current/raw/current_gtfs_schedule_stop_103865
index d4331750..89ccd749 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103865
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103865
@@ -1,4 +1,5 @@
-'2046',1001,93200,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,71900,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,105000,,'',0,68000,,'',0
-'2054',1401,84500,,'',0,21400,,'',0,48600,,'',0
+'2047',1001,105000,,'',0,68000,,'',0
+'2293',1001,71900,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,93300,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,105000,,'',0,68200,,'',0
+'2430',1401,84500,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103867 b/src/main/res-current/raw/current_gtfs_schedule_stop_103867
index 2f2cd7a4..122ecabb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103867
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103867
@@ -1,7 +1,9 @@
-'2046',1001,92900,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,104700,,'',0,68000,,'',0
-'2054',1401,84300,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,80600,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,103300,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,4100,,'',0
-'2064',2001,125800,,'',0,20000,,'',0
+'2047',1001,104700,,'',0,68000,,'',0
+'2293',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,93000,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,104700,,'',0,68200,,'',0
+'2430',1401,84300,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125800,,'',0,20000,,'',0
+'2293',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
+'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103868 b/src/main/res-current/raw/current_gtfs_schedule_stop_103868
index 2f2cd7a4..d9c89247 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103868
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103868
@@ -1,7 +1,9 @@
-'2046',1001,92900,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,104700,,'',0,68000,,'',0
-'2054',1401,84300,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,80600,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,103300,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,4100,,'',0
-'2064',2001,125800,,'',0,20000,,'',0
+'2047',1001,104700,,'',0,68000,,'',0
+'2293',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
+'2660',1001,93000,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
+'2661',1001,104700,,'',0,68200,,'',0
+'2430',1401,84300,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125800,,'',0,20000,,'',0
+'2293',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
+'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103869 b/src/main/res-current/raw/current_gtfs_schedule_stop_103869
index 2ad1b897..82f9dffa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103869
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103869
@@ -1,4 +1,5 @@
-'2046',1000,102200,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75700,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114200,,'',0,67900,0,'Downtown',0
-'2054',1400,90900,,'',0,21400,,'',0,48600,,'',0
+'2047',1000,114200,,'',0,67900,0,'Downtown',0
+'2293',1000,75700,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,102100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103870 b/src/main/res-current/raw/current_gtfs_schedule_stop_103870
index 9b05a65c..88e3e8fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103870
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103870
@@ -1,3 +1,4 @@
-'2046',400,90500,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,80800,,'',0,9200,,'',0,10900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,134000,,'',0,20000,,'',0,38000,,'',0
+'2047',400,134000,,'',0,20000,,'',0,38000,,'',0
+'2293',400,80700,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90400,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124500,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103871 b/src/main/res-current/raw/current_gtfs_schedule_stop_103871
index ae649d6b..64b33294 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103871
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103871
@@ -1,3 +1,4 @@
-'2046',400,90400,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,80700,,'',0,5200,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,133900,,'',0,20000,,'',0,38000,,'',0
+'2047',400,133900,,'',0,20000,,'',0,38000,,'',0
+'2293',400,80600,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90300,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124400,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103872 b/src/main/res-current/raw/current_gtfs_schedule_stop_103872
index 48f80305..c4eda130 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103872
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103872
@@ -1,3 +1,4 @@
-'2046',401,85200,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,85100,,'',0,10800,,'',0,14400,,'',0,11000,,'',0,10800,,'',0,9900,,'',0,13900,,'',0,14600,,'',0,13200,,'',0
-'2064',401,92200,,'',0,48000,,'',0,20500,,'',0
+'2047',401,92200,,'',0,48000,,'',0,20500,,'',0
+'2293',401,85700,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,18900,,'',0,11700,,'',0,10500,,'',0
+'2660',401,85200,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
+'2661',401,91700,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103873 b/src/main/res-current/raw/current_gtfs_schedule_stop_103873
index fe62d718..34857e40 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103873
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103873
@@ -1 +1 @@
-'2048',9900,80900,0,'VMP Connector',0
+'2293',9900,80900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_103874 b/src/main/res-current/raw/current_gtfs_schedule_stop_103874
index 30c49126..072b692b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_103874
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_103874
@@ -1 +1 @@
-'2048',9901,155700,0,'VMP Connector',0
+'2293',9901,155700,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110227 b/src/main/res-current/raw/current_gtfs_schedule_stop_110227
index 7f8d221d..9a85ab83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110227
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110227
@@ -1,2 +1,2 @@
-'2048',1201,71800,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2048',9901,152700,0,'VMP Connector',0
+'2293',1201,71800,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2293',9901,152700,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110247 b/src/main/res-current/raw/current_gtfs_schedule_stop_110247
index f3fdaa17..3eba03ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110247
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110247
@@ -1 +1 @@
-'2048',9900,85100,0,'VMP Connector',0
+'2293',9900,85100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110248 b/src/main/res-current/raw/current_gtfs_schedule_stop_110248
index e5fd78e1..62ea8d58 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110248
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110248
@@ -1,4 +1,5 @@
-'2046',601,83400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63900,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,82800,0,'VMP Connector',0
+'2047',601,102900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,101900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,82800,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110270 b/src/main/res-current/raw/current_gtfs_schedule_stop_110270
index 722fcfb4..f0bf87ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110270
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110270
@@ -1,4 +1,4 @@
-'2046',500,152100,0,'Vanier',0
-'2048',500,81500,0,'Vanier',0,3000,0,'Vanier',0,67400,0,'Vanier',0,10400,0,'Vanier',0
-'2046',1200,114200,,'',0,60000,,'',0
-'2048',1200,60900,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',500,81500,0,'Vanier',0,3000,0,'Vanier',0,67400,0,'Vanier',0,10400,0,'Vanier',0
+'2660',500,152600,0,'Vanier',0
+'2293',1200,60900,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,114000,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110303 b/src/main/res-current/raw/current_gtfs_schedule_stop_110303
index a53ada98..989b8110 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110303
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110303
@@ -1 +1 @@
-'2048',1201,72100,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,72100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110305 b/src/main/res-current/raw/current_gtfs_schedule_stop_110305
index f40bf614..fd94aa12 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110305
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110305
@@ -1,6 +1,9 @@
-'2046',101,73700,,'',0,7200,0,'Downtown',0,3900,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3400,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61200,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3900,,'',0,8000,,'',0,7000,,'',0,3800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93000,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2046',1101,101000,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,32200,,'',0
-'2048',1101,73400,,'',0,27300,,'',0,11500,,'',0,28100,,'',0,12000,,'',0,39900,,'',0,32500,,'',0
-'2048',1201,72500,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2047',101,93000,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,164200,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,60200,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15500,,'',0
+'2656',101,164200,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73400,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
+'2661',101,92000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
+'2293',1101,73400,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
+'2660',1101,100800,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
+'2293',1201,72500,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110324 b/src/main/res-current/raw/current_gtfs_schedule_stop_110324
index 8e0ea4dc..9ea4474f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110324
@@ -1,3 +1,4 @@
-'2046',1001,94500,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,73200,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,110300,,'',0,64000,,'',0
+'2047',1001,110300,,'',0,64000,,'',0
+'2293',1001,73200,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,94600,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,110300,,'',0,64200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110336 b/src/main/res-current/raw/current_gtfs_schedule_stop_110336
index 6b052e04..3037303f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110336
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110336
@@ -1,3 +1,4 @@
-'2046',1000,101000,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75500,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,113000,,'',0,68000,0,'Downtown',0
+'2047',1000,113000,,'',0,68000,0,'Downtown',0
+'2293',1000,75500,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,100900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,112600,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110337 b/src/main/res-current/raw/current_gtfs_schedule_stop_110337
index bd98c929..e35308c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110337
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110337
@@ -1,4 +1,5 @@
-'2046',1000,101700,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,80200,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,113700,,'',0,68000,0,'Downtown',0
-'2054',1400,90500,,'',0,21400,,'',0,48600,,'',0
+'2047',1000,113700,,'',0,68000,0,'Downtown',0
+'2293',1000,80200,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,101600,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113300,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90500,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110338 b/src/main/res-current/raw/current_gtfs_schedule_stop_110338
index 0320234c..e07e8009 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110338
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110338
@@ -1,4 +1,5 @@
-'2046',1000,101900,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,80400,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,113900,,'',0,68000,0,'Downtown',0
-'2054',1400,90700,,'',0,21400,,'',0,48600,,'',0
+'2047',1000,113900,,'',0,68000,0,'Downtown',0
+'2293',1000,80400,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,101800,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113500,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90700,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110377 b/src/main/res-current/raw/current_gtfs_schedule_stop_110377
index b8340dc8..51bdd127 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110377
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110377
@@ -1,3 +1,4 @@
-'2046',401,85100,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,85000,,'',0,10800,,'',0,14400,,'',0,11000,,'',0,10800,,'',0,9800,,'',0,13900,,'',0,14700,,'',0,13200,,'',0
-'2064',401,92100,,'',0,48000,,'',0,20500,,'',0
+'2047',401,92100,,'',0,48000,,'',0,20500,,'',0
+'2293',401,85600,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,15000,,'',0,15700,,'',0,10500,,'',0
+'2660',401,85100,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
+'2661',401,91600,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110379 b/src/main/res-current/raw/current_gtfs_schedule_stop_110379
index 3e55b551..f3ce57fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110379
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110379
@@ -1,3 +1,3 @@
-'2046',1100,93800,,'',0,11600,,'',0,40000,,'',0,39800,,'',0,36400,,'',0
-'2048',1100,70700,,'',0,23000,,'',0,11500,,'',0,28000,,'',0,12000,,'',0,40000,,'',0,36500,,'',0
-'2054',1301,95000,,'',0,25400,,'',0,44600,,'',0
+'2293',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
+'2660',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
+'2430',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110397 b/src/main/res-current/raw/current_gtfs_schedule_stop_110397
index 4b5b85d0..cc4e7430 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110397
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110397
@@ -1 +1 @@
-'2054',1301,95600,,'',0,25400,,'',0,44600,,'',0
+'2430',1301,95600,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110398 b/src/main/res-current/raw/current_gtfs_schedule_stop_110398
index f05dd022..7a0b978a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110398
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110398
@@ -1,2 +1,2 @@
-'2046',1200,120700,,'',0,60000,,'',0
-'2048',1200,63400,,'',0,17000,,'',0,40000,,'',0,15400,,'',0,34600,,'',0,10000,,'',0
+'2293',1200,63400,,'',0,17000,,'',0,40100,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
+'2660',1200,120500,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110413 b/src/main/res-current/raw/current_gtfs_schedule_stop_110413
index 935d3bdd..1413bc3c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110413
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110413
@@ -1,2 +1,2 @@
-'2046',1201,122800,,'',0,60000,,'',0
-'2048',1201,65600,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,65600,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,122800,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110420 b/src/main/res-current/raw/current_gtfs_schedule_stop_110420
index 95dd6ff9..fb19c8ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110420
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110420
@@ -1 +1 @@
-'2054',1301,95800,,'',0,25400,,'',0,44600,,'',0
+'2430',1301,95800,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110448 b/src/main/res-current/raw/current_gtfs_schedule_stop_110448
index f481a432..1aa37d7c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110448
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110448
@@ -1 +1 @@
-'2054',1301,100900,,'',0,21400,,'',0,48600,,'',0
+'2430',1301,100900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110493 b/src/main/res-current/raw/current_gtfs_schedule_stop_110493
index 205a86b2..5a213d00 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110493
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110493
@@ -1,4 +1,5 @@
-'2046',1001,93300,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,72000,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,105100,,'',0,68000,,'',0
-'2054',1401,84700,,'',0,25400,,'',0,44600,,'',0
+'2047',1001,105100,,'',0,68000,,'',0
+'2293',1001,72000,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,93400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,105100,,'',0,68200,,'',0
+'2430',1401,84700,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110523 b/src/main/res-current/raw/current_gtfs_schedule_stop_110523
index 32c7ffbf..9a15208b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110523
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110523
@@ -1 +1,4 @@
-'2054',1401,85200,,'',0,25400,,'',0,44600,,'',0
+'2293',1001,72500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,93900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,105600,,'',0,68200,,'',0
+'2430',1401,85200,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110524 b/src/main/res-current/raw/current_gtfs_schedule_stop_110524
index 7166ad78..4f7930bc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110524
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110524
@@ -1,2 +1,2 @@
-'2048',1001,75200,,'',0
-'2054',1401,84200,,'',0,21400,,'',0,48600,,'',0
+'2293',1001,75200,,'',0
+'2430',1401,84200,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110525 b/src/main/res-current/raw/current_gtfs_schedule_stop_110525
index c0942fcc..38c147ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110525
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110525
@@ -1,2 +1,2 @@
-'2046',1101,95900,,'',0,15500,,'',0,40000,,'',0,40000,,'',0,32200,,'',0
-'2048',1101,72400,,'',0,23300,,'',0,15500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
+'2293',1101,72400,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1101,95700,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110526 b/src/main/res-current/raw/current_gtfs_schedule_stop_110526
index 6cae7e6c..85c02149 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110526
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110526
@@ -1,7 +1,7 @@
-'2046',500,152500,4,'',0
-'2046',501,152500,0,'Anfield Ctr',0
-'2048',500,81800,4,'',0,3000,4,'',0,67500,4,'',0,10400,4,'',0
-'2048',501,81800,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Anfield Ctr',0,10200,0,'Vanier',0
-'2046',1201,125100,,'',0,60000,,'',0
-'2054',1301,102100,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,85400,0,'VMP Connector',0
+'2293',500,81800,4,'',0,3000,4,'',0,67500,4,'',0,10400,4,'',0
+'2293',501,81800,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
+'2660',500,153000,4,'',0
+'2660',501,153000,0,'Vanier',0
+'2660',1201,125100,,'',0,60000,,'',0
+'2430',1301,102100,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,85400,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110528 b/src/main/res-current/raw/current_gtfs_schedule_stop_110528
index f33a8f87..b70950c0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110528
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110528
@@ -1,2 +1,2 @@
-'2046',1001,91600,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,70100,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2293',1001,70100,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1001,91500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110529 b/src/main/res-current/raw/current_gtfs_schedule_stop_110529
index 3b65b9e5..db898d45 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110529
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110529
@@ -1,3 +1,3 @@
-'2046',1000,103100,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1000,80600,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2064',1000,115100,,'',0
+'2047',1000,115100,,'',0
+'2293',1000,80600,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
+'2660',1000,103000,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110530 b/src/main/res-current/raw/current_gtfs_schedule_stop_110530
index 7f67a4e6..fa209aa0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110530
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110530
@@ -1,3 +1,6 @@
-'2046',100,75000,,'',0,9400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63800,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93400,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2047',100,93400,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171700,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,63000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171700,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,74500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92400,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110531 b/src/main/res-current/raw/current_gtfs_schedule_stop_110531
index 799634c5..15fad5a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110531
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110531
@@ -1,11 +1,18 @@
-'2046',100,80900,4,'',0,9400,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7100,4,'',0,3600,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,2300,4,'',0,2800,4,'',0,7000,4,'',0,7500,4,'',0,3400,4,'',0,10000,4,'',0,10000,4,'',0,12000,4,'',0
-'2048',100,65600,4,'',0,6000,4,'',0,2500,4,'',0,6000,4,'',0,1900,4,'',0,1800,4,'',0,1400,4,'',0,6000,4,'',0,2500,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,4000,4,'',0,8100,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,2200,4,'',0,5800,4,'',0,1500,4,'',0,1900,4,'',0,6100,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,3200,4,'',0,8000,4,'',0,3000,4,'',0,7900,4,'',0,10000,4,'',0,10000,4,'',0
-'2064',100,95400,4,'',0,8500,4,'',0,10000,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10500,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10400,4,'',0
-'2046',301,81500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73200,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,84800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2046',400,91200,4,'',0,10200,4,'',0,10800,4,'',0,10800,4,'',0,10600,4,'',0,11000,4,'',0,18000,4,'',0,9800,4,'',0,11100,4,'',0
-'2048',400,81400,4,'',0,9300,4,'',0,10900,4,'',0,10500,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,17800,4,'',0,10500,4,'',0,13000,4,'',0
-'2064',400,134700,4,'',0,20000,4,'',0,37900,4,'',0
-'2053',1500,93700,4,'',0,8000,4,'',0,4000,4,'',0,28000,4,'',0,8000,4,'',0,4000,4,'',0
-'2053',1501,90000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2047',100,95400,4,'',0,8500,4,'',0,10000,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10500,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10400,4,'',0
+'2089',100,153700,4,'',0,20100,4,'',0,27300,4,'',0,12000,4,'',0,10500,4,'',0,17500,4,'',0
+'2293',100,64800,4,'',0,7000,4,'',0,1900,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1600,4,'',0,6500,4,'',0,2000,4,'',0,6200,4,'',0,2000,4,'',0,2100,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,7000,4,'',0,1800,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,8300,4,'',0,2600,4,'',0,7500,4,'',0,3500,4,'',0,11400,4,'',0
+'2656',100,153700,4,'',0,20100,4,'',0,27300,4,'',0,12000,4,'',0,10500,4,'',0
+'2660',100,80500,4,'',0,9900,4,'',0,4100,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,8100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3300,4,'',0,7900,4,'',0,7900,4,'',0,4000,4,'',0,8000,4,'',0,10500,4,'',0,17500,4,'',0
+'2661',100,94500,4,'',0,8500,4,'',0,9500,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,9000,4,'',0,10000,4,'',0,9800,4,'',0,9800,4,'',0,5000,4,'',0,9900,4,'',0
+'2047',301,84800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,154500,,'',0,19800,,'',0
+'2293',301,73100,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,154500,,'',0,19800,,'',0
+'2660',301,81000,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,84000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
+'2047',400,134700,4,'',0,20000,4,'',0,37900,4,'',0
+'2293',400,81400,4,'',0,10300,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,19000,4,'',0,11400,4,'',0,16400,4,'',0
+'2660',400,91200,4,'',0,12200,4,'',0,11500,4,'',0,15600,4,'',0,11000,4,'',0,10000,4,'',0,10300,4,'',0,12200,4,'',0,16100,4,'',0
+'2661',400,125300,4,'',0,29200,4,'',0,38200,4,'',0
+'2658',1500,93700,4,'',0,8000,4,'',0,4000,4,'',0,28000,4,'',0,8000,4,'',0,4000,4,'',0
+'2658',1501,90000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110532 b/src/main/res-current/raw/current_gtfs_schedule_stop_110532
index 97c3fe9d..addb05cd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110532
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110532
@@ -1,6 +1,12 @@
-'2046',100,80600,,'',0,9400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65300,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,95100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
-'2046',301,82900,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,82800,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',100,95100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
+'2089',100,153300,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64500,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153300,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80200,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,94100,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,9900,,'',0
+'2047',301,90200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160000,,'',0,15800,,'',0
+'2293',301,82900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160000,,'',0,15800,,'',0
+'2660',301,82500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110533 b/src/main/res-current/raw/current_gtfs_schedule_stop_110533
index 130e360a..158b9421 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110533
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110533
@@ -1,3 +1,6 @@
-'2046',301,83300,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,14400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160500,,'',0,19800,,'',0
+'2293',301,83400,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160500,,'',0,19800,,'',0
+'2660',301,83000,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110534 b/src/main/res-current/raw/current_gtfs_schedule_stop_110534
index 9d3fdec5..ace29dca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110534
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110534
@@ -1,3 +1,6 @@
-'2046',301,83600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83500,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,14400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160800,,'',0,19800,,'',0
+'2293',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160800,,'',0,19800,,'',0
+'2660',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110535 b/src/main/res-current/raw/current_gtfs_schedule_stop_110535
index 9d3fdec5..ace29dca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110535
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110535
@@ -1,3 +1,6 @@
-'2046',301,83600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83500,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,14400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160800,,'',0,19800,,'',0
+'2293',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160800,,'',0,19800,,'',0
+'2660',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110536 b/src/main/res-current/raw/current_gtfs_schedule_stop_110536
index 564c3e26..12e86421 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110536
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110536
@@ -1,3 +1,6 @@
-'2046',301,83700,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,14800,,'',0,10700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83600,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,14800,,'',0,10400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,91000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,91000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160900,,'',0,19800,,'',0
+'2293',301,83800,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160900,,'',0,19800,,'',0
+'2660',301,83400,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,90300,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110537 b/src/main/res-current/raw/current_gtfs_schedule_stop_110537
index e612c95b..c86e4dc8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110537
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110537
@@ -1,4 +1,7 @@
-'2046',301,81600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73300,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,84900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2053',1501,90100,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2047',301,84900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,154600,,'',0,19800,,'',0
+'2293',301,73200,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,154600,,'',0,19800,,'',0
+'2660',301,81100,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,84100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
+'2658',1501,90100,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110538 b/src/main/res-current/raw/current_gtfs_schedule_stop_110538
index 28fc69b9..7807654c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110538
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110538
@@ -1,3 +1,6 @@
-'2046',301,81600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73300,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,84900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,84900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,154700,,'',0,19800,,'',0
+'2293',301,73300,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,154700,,'',0,19800,,'',0
+'2660',301,81200,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110539 b/src/main/res-current/raw/current_gtfs_schedule_stop_110539
index a1d1465b..62b7f354 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110539
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110539
@@ -1,4 +1,7 @@
-'2046',100,83900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5600,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7400,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2054',1400,91800,,'',0,21400,,'',0,48700,,'',0
+'2047',100,92900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171200,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171200,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2430',1400,91800,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110542 b/src/main/res-current/raw/current_gtfs_schedule_stop_110542
index 2087bba4..5852729e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110542
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110542
@@ -1,2 +1,2 @@
-'2046',1200,115700,,'',0,60000,,'',0
-'2048',1200,62400,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',1200,62400,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,115500,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110543 b/src/main/res-current/raw/current_gtfs_schedule_stop_110543
index 61d506fb..da779578 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110543
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110543
@@ -1,2 +1,2 @@
-'2046',1201,123300,,'',0,60000,,'',0
-'2048',1201,70100,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,70100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,123300,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110544 b/src/main/res-current/raw/current_gtfs_schedule_stop_110544
index cd251ce9..a156044e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110544
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110544
@@ -1,2 +1,2 @@
-'2046',1200,120000,,'',0,60000,,'',0
-'2048',1200,62700,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',1200,62700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,115800,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110545 b/src/main/res-current/raw/current_gtfs_schedule_stop_110545
index d0825295..4a8d8713 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110545
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110545
@@ -1,3 +1,4 @@
-'2046',400,90600,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,80900,,'',0,9200,,'',0,10900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,134100,,'',0,20000,,'',0,38000,,'',0
+'2047',400,134100,,'',0,20000,,'',0,38000,,'',0
+'2293',400,80800,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90500,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124600,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110546 b/src/main/res-current/raw/current_gtfs_schedule_stop_110546
index a551107a..81a60bdb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110546
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110546
@@ -1,2 +1,2 @@
-'2046',1200,114600,,'',0,60000,,'',0
-'2048',1200,61300,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',1200,61300,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,114400,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110547 b/src/main/res-current/raw/current_gtfs_schedule_stop_110547
index 75c33522..20ad171e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110547
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110547
@@ -1,2 +1,2 @@
-'2046',1201,124800,,'',0,60000,,'',0
-'2048',1201,71600,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,71600,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,124800,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110550 b/src/main/res-current/raw/current_gtfs_schedule_stop_110550
index af036c23..6db4e3ca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110550
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110550
@@ -1,3 +1,4 @@
-'2046',800,95700,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63600,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,14200,,'',0,10800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,100200,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2047',800,100200,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63400,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
+'2660',800,84300,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,95000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110551 b/src/main/res-current/raw/current_gtfs_schedule_stop_110551
index 359096a0..f0379045 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110551
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110551
@@ -1,3 +1,4 @@
-'2046',1000,100200,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,74700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,112200,,'',0,68000,0,'Downtown',0
+'2047',1000,112200,,'',0,68000,0,'Downtown',0
+'2293',1000,74700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,100100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,111800,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110552 b/src/main/res-current/raw/current_gtfs_schedule_stop_110552
index 34f7e803..0ac2761d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110552
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110552
@@ -1,3 +1,6 @@
-'2046',301,81900,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73600,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155000,,'',0,19800,,'',0
+'2293',301,73600,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155000,,'',0,19800,,'',0
+'2660',301,81500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110553 b/src/main/res-current/raw/current_gtfs_schedule_stop_110553
index 6af6611a..eca6627e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110553
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110553
@@ -1,2 +1,2 @@
-'2046',1201,122400,,'',0,60000,,'',0
-'2048',1201,65200,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,65200,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,122400,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110554 b/src/main/res-current/raw/current_gtfs_schedule_stop_110554
index 7b619eed..0a4942be 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110554
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110554
@@ -1,2 +1,2 @@
-'2046',1201,122500,,'',0,60000,,'',0
-'2048',1201,65300,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,65300,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,122500,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110555 b/src/main/res-current/raw/current_gtfs_schedule_stop_110555
index bdb716bb..3fa727db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110555
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110555
@@ -1 +1 @@
-'2053',1501,90700,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2658',1501,90700,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110556 b/src/main/res-current/raw/current_gtfs_schedule_stop_110556
index 0d5d994e..1ae0e491 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110556
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110556
@@ -1 +1 @@
-'2053',1500,93100,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2658',1500,93100,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110557 b/src/main/res-current/raw/current_gtfs_schedule_stop_110557
index deebd698..13b31850 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110557
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110557
@@ -1 +1 @@
-'2053',1501,90800,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2658',1501,90800,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110558 b/src/main/res-current/raw/current_gtfs_schedule_stop_110558
index 83f03be1..68df2693 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110558
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110558
@@ -1 +1 @@
-'2053',1500,92900,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2658',1500,92900,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110559 b/src/main/res-current/raw/current_gtfs_schedule_stop_110559
index 019a398a..43e056e0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110559
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110559
@@ -1 +1 @@
-'2053',1501,91000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2658',1501,91000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110560 b/src/main/res-current/raw/current_gtfs_schedule_stop_110560
index c58cede6..1cc8fcc3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110560
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110560
@@ -1 +1 @@
-'2053',1500,92700,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2658',1500,92700,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110561 b/src/main/res-current/raw/current_gtfs_schedule_stop_110561
index 1a477651..a5d447f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110561
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110561
@@ -1 +1 @@
-'2053',1501,91400,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2658',1501,91400,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110562 b/src/main/res-current/raw/current_gtfs_schedule_stop_110562
index 4d17b8f3..7671854a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110562
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110562
@@ -1,2 +1 @@
-'2046',200,83200,4,'',0,10900,4,'',0,11100,4,'',0,15100,4,'',0,10400,4,'',0,10500,4,'',0,10500,4,'',0,22400,4,'',0,11600,4,'',0,15100,4,'',0,32000,4,'',0
-'2064',200,100600,4,'',0,71200,4,'',0,10000,4,'',0
+'2047',200,100600,4,'',0,71200,4,'',0,10000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110563 b/src/main/res-current/raw/current_gtfs_schedule_stop_110563
deleted file mode 100644
index d885efa6..00000000
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110563
+++ /dev/null
@@ -1,2 +0,0 @@
-'2046',200,214500,4,'',0
-'2048',200,73500,4,'',0,11700,4,'',0,9500,4,'',0,21000,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,19700,4,'',0,25400,4,'',0,19000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110564 b/src/main/res-current/raw/current_gtfs_schedule_stop_110564
deleted file mode 100644
index cd18a4dd..00000000
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110564
+++ /dev/null
@@ -1,2 +0,0 @@
-'2046',501,153300,4,'',0
-'2048',501,153300,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110565 b/src/main/res-current/raw/current_gtfs_schedule_stop_110565
index 930e8167..0d08ce83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110565
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110565
@@ -1,3 +1,4 @@
-'2046',601,82800,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63300,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2047',601,102300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,101300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_110566 b/src/main/res-current/raw/current_gtfs_schedule_stop_110566
index bd2463db..62cce80a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_110566
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_110566
@@ -1,3 +1,4 @@
-'2046',800,95900,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63800,,'',0,11300,,'',0,15500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,100400,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2047',800,100400,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63600,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
+'2660',800,84500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
+'2661',800,95200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111270 b/src/main/res-current/raw/current_gtfs_schedule_stop_111270
index 45fff800..5fc20c87 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111270
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111270
@@ -1,3 +1,6 @@
-'2046',101,74200,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61600,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,3900,,'',0,8000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93500,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2047',101,93500,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,164800,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60700,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
+'2656',101,164800,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111271 b/src/main/res-current/raw/current_gtfs_schedule_stop_111271
index 860cfdd7..c3a1068f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111271
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111271
@@ -1,4 +1,7 @@
-'2046',101,74400,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61800,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7900,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93700,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83100,,'',0,21400,,'',0,48600,,'',0
+'2047',101,93700,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165000,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165000,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83100,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111272 b/src/main/res-current/raw/current_gtfs_schedule_stop_111272
index 9e71c879..a7063e09 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111272
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111272
@@ -1,4 +1,7 @@
-'2046',101,74700,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,14300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,94000,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83300,,'',0,21400,,'',0,48600,,'',0
+'2047',101,94000,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165300,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,61100,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165300,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74400,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,93100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83300,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111273 b/src/main/res-current/raw/current_gtfs_schedule_stop_111273
index 16fa3f01..932a363c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111273
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111273
@@ -1,4 +1,7 @@
-'2046',101,74800,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,14300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62100,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,94100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83400,,'',0,21400,,'',0,48600,,'',0
+'2047',101,94100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111274 b/src/main/res-current/raw/current_gtfs_schedule_stop_111274
index 16fa3f01..932a363c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111274
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111274
@@ -1,4 +1,7 @@
-'2046',101,74800,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,14300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62100,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,94100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83400,,'',0,21400,,'',0,48600,,'',0
+'2047',101,94100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111275 b/src/main/res-current/raw/current_gtfs_schedule_stop_111275
index f8afb003..7125350b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111275
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111275
@@ -1,24 +1,39 @@
-'2046',100,83500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2046',101,75200,4,'',0,15100,4,'',0,3700,4,'',0,7500,4,'',0,3600,4,'',0,7600,4,'',0,7600,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,2700,4,'',0,6800,4,'',0,8000,4,'',0,2500,4,'',0,7000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'2048',100,63000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62600,4,'',0,2000,4,'',0,6500,4,'',0,2000,4,'',0,1700,4,'',0,1000,4,'',0,5500,4,'',0,2100,4,'',0,2300,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,2200,4,'',0,700,4,'',0,800,4,'',0,5800,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,7800,4,'',0,4000,4,'',0,7000,4,'',0,3700,4,'',0,7000,4,'',0,7500,4,'',0,10000,4,'',0
-'2064',100,92500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2064',101,94500,4,'',0,9000,4,'',0,11100,4,'',0,10000,4,'',0,10100,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10300,4,'',0,7900,4,'',0,9400,4,'',0
-'2046',200,162800,4,'',0
-'2046',201,91000,,'',0,33000,,'',0,10500,,'',0,10500,,'',0,38000,,'',0,28800,,'',0,18200,,'',0
-'2048',200,64400,4,'',0,41500,4,'',0,58500,4,'',0,8100,4,'',0,3200,4,'',0
-'2048',201,61700,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',200,132600,4,'',0,20000,4,'',0
-'2064',201,93500,,'',0,71500,,'',0,10000,,'',0
-'2046',800,94500,,'',0,11000,,'',0,15500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,17000,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2046',801,90800,4,'',0,11000,4,'',0,11000,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10200,4,'',0,16800,4,'',0,10500,4,'',0,19000,4,'',0
-'2048',800,62400,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,15000,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9200,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2048',801,70200,4,'',0,12300,4,'',0,9500,4,'',0,10000,4,'',0,10300,4,'',0,11400,4,'',0,10000,4,'',0,9300,4,'',0,12300,4,'',0,8100,4,'',0,19300,4,'',0,10000,4,'',0,19100,4,'',0
-'2064',800,95000,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
-'2064',801,110300,4,'',0,20500,4,'',0,21000,4,'',0,20000,4,'',0,19000,4,'',0
-'2064',1000,182400,4,'',0
-'2064',1001,104000,,'',0,68000,,'',0
-'2054',1400,91200,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,75800,,'',0,26000,,'',0,11100,,'',0,42500,,'',0,15300,,'',0,22700,,'',0
-'2048',2001,102500,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,4100,,'',0
-'2064',2001,125000,,'',0,20000,,'',0
+'2047',100,92500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',101,94500,4,'',0,9000,4,'',0,11100,4,'',0,10000,4,'',0,10100,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10300,4,'',0,7900,4,'',0,9400,4,'',0
+'2089',100,170700,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2089',101,165900,4,'',0,28100,4,'',0,11800,4,'',0,14500,4,'',0,10900,4,'',0
+'2293',100,62200,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2293',101,61700,4,'',0,2900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5700,4,'',0,1500,4,'',0,2500,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,3100,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,3000,4,'',0,7100,4,'',0,2000,4,'',0,1000,4,'',0,1000,4,'',0,6000,4,'',0,2000,4,'',0,8400,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,11500,4,'',0
+'2656',100,170700,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2656',101,165900,4,'',0,28100,4,'',0,11800,4,'',0,14500,4,'',0
+'2660',100,83500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2660',101,74900,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,4000,4,'',0,8000,4,'',0,7900,4,'',0,4000,4,'',0,14500,4,'',0,10900,4,'',0
+'2661',100,91500,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2661',101,93600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,8900,4,'',0,10000,4,'',0,9900,4,'',0,9400,4,'',0,8900,4,'',0,9800,4,'',0
+'2047',200,132600,4,'',0,20000,4,'',0
+'2047',201,93500,,'',0,71500,,'',0,10000,,'',0
+'2089',200,233900,4,'',0
+'2089',201,231200,,'',0
+'2293',200,64200,4,'',0,8500,4,'',0,12500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,14900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,4000,4,'',0,9000,4,'',0,11500,4,'',0,15500,4,'',0,14000,4,'',0
+'2293',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',200,83100,4,'',0,11000,4,'',0,11500,4,'',0,15000,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,10000,4,'',0,11500,4,'',0,16000,4,'',0,14000,4,'',0,19300,4,'',0
+'2660',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',200,95600,4,'',0,37500,4,'',0,20000,4,'',0,19700,4,'',0,19400,4,'',0
+'2661',201,92900,,'',0,77200,,'',0,15400,,'',0
+'2047',800,95000,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
+'2047',801,110300,4,'',0,20500,4,'',0,21000,4,'',0,20000,4,'',0,19000,4,'',0
+'2293',800,62200,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2293',801,70000,4,'',0,12500,4,'',0,9500,4,'',0,9800,4,'',0,10500,4,'',0,10900,4,'',0,10700,4,'',0,9300,4,'',0,12100,4,'',0,14900,4,'',0,12200,4,'',0,11500,4,'',0,18000,4,'',0
+'2660',800,83100,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2660',801,91400,4,'',0,10800,4,'',0,11000,4,'',0,10700,4,'',0,10500,4,'',0,9800,4,'',0,11500,4,'',0,14700,4,'',0,11500,4,'',0,11300,4,'',0,18700,4,'',0
+'2661',800,93800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
+'2661',801,105500,4,'',0,20200,4,'',0,19700,4,'',0,20100,4,'',0,20000,4,'',0
+'2047',1000,182400,4,'',0
+'2047',1001,104000,,'',0,68000,,'',0
+'2661',1000,114000,4,'',0,68400,4,'',0
+'2661',1001,104000,,'',0,68200,,'',0
+'2430',1400,91200,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125000,,'',0,20000,,'',0
+'2293',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
+'2661',2001,125700,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111276 b/src/main/res-current/raw/current_gtfs_schedule_stop_111276
index f73b01c5..97639718 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111276
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111276
@@ -1,14 +1,22 @@
-'2046',100,83600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63100,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2046',201,91000,,'',0,33000,,'',0,10500,,'',0,10500,,'',0,38000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,61700,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,93500,,'',0,71500,,'',0,10000,,'',0
-'2046',800,94600,,'',0,11000,,'',0,15500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,17000,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62500,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,15000,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9200,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95100,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
-'2064',1001,104000,,'',0,68000,,'',0
-'2054',1400,91300,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,75800,,'',0,26000,,'',0,11100,,'',0,42500,,'',0,15300,,'',0,22700,,'',0
-'2048',2001,102500,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,4100,,'',0
-'2064',2001,125000,,'',0,20000,,'',0
+'2047',100,92600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,170800,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62300,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,170800,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91600,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2047',201,93500,,'',0,71500,,'',0,10000,,'',0
+'2089',201,231200,,'',0
+'2293',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,92900,,'',0,77200,,'',0,15400,,'',0
+'2047',800,95100,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
+'2293',800,62300,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83200,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,93900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
+'2047',1001,104000,,'',0,68000,,'',0
+'2661',1001,104000,,'',0,68200,,'',0
+'2430',1400,91300,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125000,,'',0,20000,,'',0
+'2293',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
+'2661',2001,125700,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111277 b/src/main/res-current/raw/current_gtfs_schedule_stop_111277
index 050f22dd..4f9a6ee5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111277
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111277
@@ -1,8 +1,12 @@
-'2046',100,83700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63200,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2048',200,80000,0,'Comox Mall',0
-'2046',800,94700,,'',0,11000,,'',0,15500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,17000,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62600,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,15000,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9200,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95200,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
-'2054',1400,91400,,'',0,21400,,'',0,48600,,'',0
+'2047',100,92700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2293',200,75700,0,'Comox Mall',0
+'2047',800,95200,,'',0,20000,,'',0,20500,,'',0,19500,,'',0,28000,,'',0
+'2293',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83300,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
+'2430',1400,91400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111278 b/src/main/res-current/raw/current_gtfs_schedule_stop_111278
index cfcddee7..b0568ec6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111278
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111278
@@ -1,24 +1,30 @@
-'2046',100,83800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92800,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2048',200,80100,4,'',0
-'2046',400,90000,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2046',401,85600,4,'',0,14600,4,'',0,10600,4,'',0,11000,4,'',0,10600,4,'',0,11000,4,'',0,18000,4,'',0,9900,4,'',0,11100,4,'',0
-'2048',400,80300,,'',0,5200,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2048',401,85500,4,'',0,14900,4,'',0,10500,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,18000,4,'',0,10400,4,'',0,13000,4,'',0
-'2064',400,133500,,'',0,20000,,'',0,38000,,'',0
-'2064',401,92700,4,'',0,48200,4,'',0,20500,4,'',0
-'2048',500,80700,0,'Vanier',0,3000,0,'Vanier',0
-'2046',701,90400,4,'',0,70200,4,'',0
-'2048',701,80300,4,'',0,74900,4,'',0,8200,4,'',0
-'2046',800,94800,,'',0,11000,,'',0,15600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62700,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95300,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
-'2046',1000,102700,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2046',1001,92200,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,80200,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2048',1001,70700,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2064',1000,114700,,'',0
-'2054',1400,91500,,'',0,21400,,'',0,48700,,'',0
-'2054',1401,83600,,'',0,21400,,'',0,48600,,'',0
-'2048',2001,160700,,'',0
+'2047',100,92800,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171000,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62500,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171000,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83800,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91800,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2293',200,75800,4,'',0
+'2047',400,133500,,'',0,20000,,'',0,38000,,'',0
+'2047',401,92700,4,'',0,48200,4,'',0,20500,4,'',0
+'2293',400,80200,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2293',401,90200,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10800,4,'',0,10100,4,'',0,19000,4,'',0,11500,4,'',0,10400,4,'',0
+'2660',400,85900,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2660',401,85700,4,'',0,16200,4,'',0,11500,4,'',0,11600,4,'',0,15000,4,'',0,10000,4,'',0,13200,4,'',0,10400,4,'',0,10100,4,'',0
+'2661',400,124000,,'',0,29200,,'',0,38300,,'',0
+'2661',401,92300,4,'',0,31500,4,'',0,29200,4,'',0
+'2293',500,80700,0,'Vanier',0,3000,0,'Vanier',0
+'2293',701,80300,4,'',0,74900,4,'',0,8200,4,'',0
+'2660',701,90600,4,'',0,65300,4,'',0
+'2047',800,95300,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
+'2293',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
+'2047',1000,114700,,'',0
+'2293',1000,80200,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2293',1001,70700,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1000,102600,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1001,92100,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2430',1400,91500,,'',0,21400,,'',0,48700,,'',0
+'2430',1401,83600,,'',0,21400,,'',0,48600,,'',0
+'2293',2001,160900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111280 b/src/main/res-current/raw/current_gtfs_schedule_stop_111280
index 8d84e0cc..08765b88 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111280
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111280
@@ -1,4 +1,7 @@
-'2046',100,83900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2054',1400,91700,,'',0,21400,,'',0,48700,,'',0
+'2047',100,92900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171100,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171100,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2430',1400,91700,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111281 b/src/main/res-current/raw/current_gtfs_schedule_stop_111281
index 24c96dce..7a64da8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111281
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111281
@@ -1,4 +1,7 @@
-'2046',100,84000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63500,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5600,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7400,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93000,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2054',1400,91900,,'',0,21400,,'',0,48700,,'',0
+'2047',100,93000,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171300,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62700,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171300,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
+'2660',100,84000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92000,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2430',1400,91900,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111282 b/src/main/res-current/raw/current_gtfs_schedule_stop_111282
index 69c3770c..a194ad91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111282
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111282
@@ -1,4 +1,7 @@
-'2046',100,84100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63600,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5600,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7400,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2054',1400,92000,,'',0,21400,,'',0,48700,,'',0
+'2047',100,93100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171400,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171400,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
+'2660',100,84100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92100,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2430',1400,92000,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111284 b/src/main/res-current/raw/current_gtfs_schedule_stop_111284
index e1830d80..c58d3eeb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111284
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111284
@@ -1,4 +1,7 @@
-'2046',100,84200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63600,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2054',1400,92100,,'',0,21400,,'',0,48700,,'',0
+'2047',100,93200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171500,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171500,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,84200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92200,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2430',1400,92100,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111286 b/src/main/res-current/raw/current_gtfs_schedule_stop_111286
index 4a29d038..9bdfaa8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111286
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111286
@@ -1,9 +1,13 @@
-'2046',100,84300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63700,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',701,110500,0,'Arden',0,21000,0,'Arden',0,39500,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70500,0,'Arden',0,20500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,38800,0,'Arden',0,23200,0,'Arden',0
-'2046',800,100100,,'',0,11000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,18000,,'',0
-'2048',800,64000,,'',0,11300,,'',0,15500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,19000,,'',0
-'2064',800,100600,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
-'2054',1400,92200,,'',0,21400,,'',0,48700,,'',0
+'2047',100,93300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171600,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62900,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171600,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,84300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92300,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',701,70500,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,111000,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2047',800,100600,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63800,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
+'2660',800,84700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
+'2661',800,95400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
+'2430',1400,92200,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111288 b/src/main/res-current/raw/current_gtfs_schedule_stop_111288
index 988e2b13..dce98087 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111288
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111288
@@ -1,3 +1,4 @@
-'2046',2001,81500,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,104200,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,8100,,'',0
-'2064',2001,130700,,'',0,20000,,'',0
+'2047',2001,130700,,'',0,20000,,'',0
+'2293',2001,103500,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,81400,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
+'2661',2001,131400,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111289 b/src/main/res-current/raw/current_gtfs_schedule_stop_111289
index b13b7049..e99129c2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111289
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111289
@@ -1,6 +1,9 @@
-'2046',201,92100,,'',0,33000,,'',0,10500,,'',0,14500,,'',0,34000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,62800,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,94600,,'',0,75500,,'',0,10000,,'',0
-'2046',2001,81600,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,104300,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,8100,,'',0
-'2064',2001,130800,,'',0,20000,,'',0
+'2047',201,94600,,'',0,75500,,'',0,10000,,'',0
+'2089',201,232300,,'',0
+'2293',201,62600,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,92500,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,94000,,'',0,77200,,'',0,19400,,'',0
+'2047',2001,130800,,'',0,20000,,'',0
+'2293',2001,103600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,81500,,'',0,22500,,'',0,11000,,'',0,35000,,'',0,11500,,'',0,33500,,'',0
+'2661',2001,131500,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111290 b/src/main/res-current/raw/current_gtfs_schedule_stop_111290
index 4d760a91..99414327 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111290
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111290
@@ -1,9 +1,14 @@
-'2046',200,81600,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,14500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2046',201,92100,4,'',0,33000,4,'',0,10500,4,'',0,14500,4,'',0,34000,4,'',0,28800,4,'',0,18200,4,'',0
-'2048',200,62800,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2048',201,62800,4,'',0,8800,4,'',0,2500,4,'',0,9500,4,'',0,9500,4,'',0,41700,4,'',0,29700,4,'',0,9600,4,'',0,19800,4,'',0,19000,4,'',0
-'2064',200,95000,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
-'2064',201,94600,4,'',0,75500,4,'',0,10000,4,'',0
-'2046',2001,81600,4,'',0,22000,4,'',0,11100,4,'',0,46500,4,'',0,11300,4,'',0,22700,4,'',0
-'2048',2001,104300,4,'',0,9800,4,'',0,10800,4,'',0,19900,4,'',0,18000,4,'',0,8100,4,'',0
-'2064',2001,130800,4,'',0,20000,4,'',0
+'2047',200,95000,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',201,94600,4,'',0,75500,4,'',0,10000,4,'',0
+'2089',200,232300,0,'Anfield Ctr',0
+'2089',201,232300,4,'',0
+'2293',200,62600,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2293',201,62600,4,'',0,8500,4,'',0,2900,4,'',0,9600,4,'',0,9500,4,'',0,41900,4,'',0,20000,4,'',0,28500,4,'',0,11500,4,'',0,18000,4,'',0
+'2660',200,81500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2660',201,92500,4,'',0,32500,4,'',0,10500,4,'',0,36000,4,'',0,11500,4,'',0,30000,4,'',0,19300,4,'',0
+'2661',200,94000,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
+'2661',201,94000,4,'',0,77200,4,'',0,19400,4,'',0
+'2047',2001,130800,4,'',0,20000,4,'',0
+'2293',2001,103600,4,'',0,10500,4,'',0,10900,4,'',0,20000,4,'',0,18000,4,'',0,9000,4,'',0
+'2660',2001,81500,4,'',0,22500,4,'',0,11000,4,'',0,35000,4,'',0,11500,4,'',0,33500,4,'',0
+'2661',2001,131500,4,'',0,20000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111291 b/src/main/res-current/raw/current_gtfs_schedule_stop_111291
index 38445362..159df96a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111291
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111291
@@ -1,3 +1,5 @@
-'2046',200,81700,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,14500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,62900,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95100,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95100,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232400,0,'Anfield Ctr',0
+'2293',200,62700,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,81600,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94100,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111292 b/src/main/res-current/raw/current_gtfs_schedule_stop_111292
index 34b5dc97..71ec0ac2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111292
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111292
@@ -1,3 +1,5 @@
-'2046',200,81800,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,14500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63000,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95200,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95200,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232500,0,'Anfield Ctr',0
+'2293',200,62800,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,81700,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94200,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111293 b/src/main/res-current/raw/current_gtfs_schedule_stop_111293
index e686dce8..f1175818 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111293
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111293
@@ -1,3 +1,5 @@
-'2046',200,81900,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,14500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63100,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95300,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95300,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232600,0,'Anfield Ctr',0
+'2293',200,62900,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,81800,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94300,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111294 b/src/main/res-current/raw/current_gtfs_schedule_stop_111294
index 2e6b780f..20bbf1bc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111294
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111294
@@ -1,3 +1,5 @@
-'2046',200,82100,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,14500,0,'Downtown',0,10500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63300,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95500,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95500,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232800,0,'Anfield Ctr',0
+'2293',200,63100,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,82000,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94500,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111295 b/src/main/res-current/raw/current_gtfs_schedule_stop_111295
index c8532cc2..c1259697 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111295
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111295
@@ -1,3 +1,5 @@
-'2046',200,82200,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,14500,0,'Downtown',0,10500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63400,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95600,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95600,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232900,0,'Anfield Ctr',0
+'2293',200,63200,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,82100,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94600,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111296 b/src/main/res-current/raw/current_gtfs_schedule_stop_111296
index 64de6ff7..35003363 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111296
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111296
@@ -1,14 +1,18 @@
-'2046',100,75200,,'',0,9400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',500,151900,0,'Vanier',0
-'2048',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'2046',601,81700,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62200,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1100,92700,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,36500,,'',0
-'2048',1100,65600,,'',0,27000,,'',0,11400,,'',0,27900,,'',0,12000,,'',0,40200,,'',0,36600,,'',0
-'2046',1200,114000,,'',0,60000,,'',0
-'2048',1200,60700,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
-'2054',1301,93900,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,80000,0,'VMP Connector',0
+'2047',100,93600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171900,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171900,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,74700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92600,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',500,151700,0,'Vanier',0,10400,0,'Vanier',0
+'2660',500,152400,0,'Vanier',0
+'2047',601,101200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1100,65600,,'',0,27000,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
+'2660',1100,92600,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37100,,'',0
+'2293',1200,60700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,113800,,'',0,59900,,'',0
+'2430',1301,93900,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,80000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111297 b/src/main/res-current/raw/current_gtfs_schedule_stop_111297
index a7c07472..9a5d8a9a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111297
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111297
@@ -1,10 +1,14 @@
-'2046',100,75300,,'',0,9400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7200,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',601,81700,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62200,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1100,92700,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,36500,,'',0
-'2048',1100,65700,,'',0,26900,,'',0,11400,,'',0,28000,,'',0,12000,,'',0,40200,,'',0,36600,,'',0
-'2054',1301,93900,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,80100,0,'VMP Connector',0
+'2047',100,93700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,172000,,'',0,23500,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,172000,,'',0,23500,,'',0,16000,,'',0,10500,,'',0
+'2660',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2047',601,101200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1100,65700,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
+'2660',1100,92600,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2430',1301,93900,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,80100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111298 b/src/main/res-current/raw/current_gtfs_schedule_stop_111298
index 8a4c1a73..e8605d7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111298
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111298
@@ -1,10 +1,14 @@
-'2046',100,75300,,'',0,9400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64100,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',601,81800,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62300,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1100,92800,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,36500,,'',0
-'2048',1100,65800,,'',0,26900,,'',0,11400,,'',0,28000,,'',0,12000,,'',0,40200,,'',0,36600,,'',0
-'2054',1301,94000,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,80100,0,'VMP Connector',0
+'2047',100,93700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,172000,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,63300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,172000,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2047',601,101300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1100,65800,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
+'2660',1100,92700,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2430',1301,94000,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,80100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111299 b/src/main/res-current/raw/current_gtfs_schedule_stop_111299
index 0500752e..67418e22 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111299
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111299
@@ -1,6 +1,7 @@
-'2046',601,83200,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63700,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',1201,72200,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2054',1301,94400,,'',0,21400,,'',0,48600,,'',0
-'2048',9901,160500,0,'VMP Connector',0
+'2047',601,102700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,101700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1201,72200,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2430',1301,94400,,'',0,21400,,'',0,48600,,'',0
+'2293',9901,160500,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111300 b/src/main/res-current/raw/current_gtfs_schedule_stop_111300
index d1bda8f2..e4da4de2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111300
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111300
@@ -1,3 +1,6 @@
-'2046',100,80000,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64600,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,7200,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94400,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2047',100,94400,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2089',100,152500,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,152500,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111301 b/src/main/res-current/raw/current_gtfs_schedule_stop_111301
index 581bf227..0ee0d1bb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111301
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111301
@@ -1,4 +1,7 @@
-'2046',100,80100,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64800,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2048',9901,154700,0,'VMP Connector',0
+'2047',100,94500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,152700,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,152700,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93500,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',9901,154700,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111302 b/src/main/res-current/raw/current_gtfs_schedule_stop_111302
index 0959c40a..6de84d67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111302
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111302
@@ -1,4 +1,7 @@
-'2046',100,80200,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64900,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2048',9901,154800,0,'VMP Connector',0
+'2047',100,94600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,152800,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,152800,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',9901,154800,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111303 b/src/main/res-current/raw/current_gtfs_schedule_stop_111303
index bcdb0e90..f6ffb211 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111303
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111303
@@ -1,4 +1,7 @@
-'2046',100,80300,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2048',9901,154900,0,'VMP Connector',0
+'2047',100,94700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,152900,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,152900,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93700,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',9901,154900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111304 b/src/main/res-current/raw/current_gtfs_schedule_stop_111304
index 65c577b2..ad10019f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111304
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111304
@@ -1,4 +1,7 @@
-'2046',100,80400,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65100,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94800,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2048',9901,155000,0,'VMP Connector',0
+'2047',100,94800,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,153000,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153000,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75900,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93800,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',9901,155000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111305 b/src/main/res-current/raw/current_gtfs_schedule_stop_111305
index a3afc8b9..5ae0db46 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111305
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111305
@@ -1,3 +1,6 @@
-'2046',100,80500,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65100,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2047',100,94900,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2089',100,153100,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153100,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80000,,'',0,5900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93900,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,5900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111306 b/src/main/res-current/raw/current_gtfs_schedule_stop_111306
index ce760ab2..9075ce88 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111306
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111306
@@ -1,3 +1,6 @@
-'2046',100,80600,,'',0,9400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65200,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,95000,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2047',100,95000,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2089',100,153200,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64400,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153200,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80100,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,94000,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111322 b/src/main/res-current/raw/current_gtfs_schedule_stop_111322
index b15d9de2..e52d6004 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111322
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111322
@@ -1,4 +1,7 @@
-'2046',301,83800,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,14800,,'',0,10700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83700,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,14800,,'',0,10400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,91100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2053',1501,90200,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2047',301,91100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,161000,,'',0,19800,,'',0
+'2293',301,83900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,161000,,'',0,19800,,'',0
+'2660',301,83500,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,90400,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
+'2658',1501,90200,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111323 b/src/main/res-current/raw/current_gtfs_schedule_stop_111323
index 51b4069f..dfd1b3d3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111323
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111323
@@ -1,9 +1,16 @@
-'2046',101,72500,,'',0,3000,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,800,,'',0,1500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91500,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
-'2046',301,83900,4,'',0,10000,4,'',0,10500,4,'',0,11000,4,'',0,14800,4,'',0,10700,4,'',0,10500,4,'',0,3000,4,'',0,11000,4,'',0,10000,4,'',0,10500,4,'',0
-'2048',301,83800,4,'',0,10900,4,'',0,10000,4,'',0,10700,4,'',0,14800,4,'',0,10400,4,'',0,10300,4,'',0,4000,4,'',0,6500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,10000,4,'',0
-'2064',301,91200,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0
-'2046',401,84500,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,84400,,'',0,10800,,'',0,10400,,'',0,15000,,'',0,10800,,'',0,9800,,'',0,13900,,'',0,10700,,'',0,17200,,'',0
-'2064',401,91500,,'',0,44000,,'',0,24500,,'',0
+'2047',101,91500,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
+'2089',101,162500,,'',0,28600,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55000,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,11800,,'',0
+'2656',101,162500,,'',0,28600,,'',0,12000,,'',0,10500,,'',0
+'2660',101,72100,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
+'2047',301,91200,4,'',0,20000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0
+'2089',301,161100,4,'',0,19800,4,'',0
+'2293',301,84000,4,'',0,11400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,15500,4,'',0,4000,4,'',0,16000,4,'',0,22200,4,'',0
+'2656',301,161100,4,'',0,19800,4,'',0
+'2660',301,83600,4,'',0,11700,4,'',0,15600,4,'',0,11400,4,'',0,11600,4,'',0,10000,4,'',0,10000,4,'',0,16900,4,'',0,11000,4,'',0,10600,4,'',0
+'2661',301,90500,4,'',0,19500,4,'',0,10000,4,'',0,14500,4,'',0,10500,4,'',0,18500,4,'',0,10000,4,'',0,10000,4,'',0
+'2047',401,91500,,'',0,44000,,'',0,24500,,'',0
+'2293',401,85000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
+'2660',401,84500,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
+'2661',401,91000,,'',0,31500,,'',0,29100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111324 b/src/main/res-current/raw/current_gtfs_schedule_stop_111324
index e9d97fbf..28bc7e34 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111324
@@ -1,7 +1,11 @@
-'2046',101,72600,,'',0,3000,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60100,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,800,,'',0,1500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91600,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
-'2046',401,84600,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,84500,,'',0,10800,,'',0,10400,,'',0,15000,,'',0,10800,,'',0,9800,,'',0,13900,,'',0,10700,,'',0,17200,,'',0
-'2064',401,91600,,'',0,44000,,'',0,24500,,'',0
-'2053',1501,90300,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2047',101,91600,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
+'2089',101,162600,,'',0,28600,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,11800,,'',0
+'2656',101,162600,,'',0,28600,,'',0,12000,,'',0,10500,,'',0
+'2660',101,72200,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
+'2047',401,91600,,'',0,44000,,'',0,24500,,'',0
+'2293',401,85100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
+'2660',401,84600,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
+'2661',401,91100,,'',0,31500,,'',0,29100,,'',0
+'2658',1501,90300,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111325 b/src/main/res-current/raw/current_gtfs_schedule_stop_111325
index 929b65db..85d8fd71 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111325
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111325
@@ -1,3 +1,6 @@
-'2046',101,72600,,'',0,3100,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60100,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91700,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2047',101,91700,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2089',101,162700,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,162700,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72200,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111326 b/src/main/res-current/raw/current_gtfs_schedule_stop_111326
index 1d85ae40..dcdd8dd7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111326
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111326
@@ -1,3 +1,6 @@
-'2046',101,72700,,'',0,3100,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60200,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91800,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2047',101,91800,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2089',101,162800,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55200,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,162800,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72300,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111327 b/src/main/res-current/raw/current_gtfs_schedule_stop_111327
index ac862284..e5184e5f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111327
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111327
@@ -1,3 +1,6 @@
-'2046',301,83000,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,82900,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,14300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160100,,'',0,15800,,'',0
+'2293',301,83000,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160100,,'',0,15800,,'',0
+'2660',301,82600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111328 b/src/main/res-current/raw/current_gtfs_schedule_stop_111328
index a340054a..053174c1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111328
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111328
@@ -1,3 +1,6 @@
-'2046',301,83100,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83000,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,14300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160200,,'',0,19800,,'',0
+'2293',301,83100,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160200,,'',0,19800,,'',0
+'2660',301,82700,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111329 b/src/main/res-current/raw/current_gtfs_schedule_stop_111329
index a340054a..94cbb81e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111329
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111329
@@ -1,3 +1,6 @@
-'2046',301,83100,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83000,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,14300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160300,,'',0,19800,,'',0
+'2293',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160300,,'',0,19800,,'',0
+'2660',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111330 b/src/main/res-current/raw/current_gtfs_schedule_stop_111330
index d47fc74b..ff2c9e6d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111330
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111330
@@ -1,3 +1,6 @@
-'2046',301,83200,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83100,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,14300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160300,,'',0,19800,,'',0
+'2293',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160300,,'',0,19800,,'',0
+'2660',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,85800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111331 b/src/main/res-current/raw/current_gtfs_schedule_stop_111331
index 130e360a..e97647f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111331
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111331
@@ -1,3 +1,6 @@
-'2046',301,83300,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,14700,,'',0,10500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,83200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,14400,,'',0,10300,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,160400,,'',0,19800,,'',0
+'2293',301,83300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
+'2656',301,160400,,'',0,19800,,'',0
+'2660',301,82900,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
+'2661',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111332 b/src/main/res-current/raw/current_gtfs_schedule_stop_111332
index 28d638d7..f4bd3b9f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111332
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111332
@@ -1,4 +1,5 @@
-'2046',401,84800,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,84700,,'',0,10800,,'',0,10400,,'',0,15000,,'',0,10800,,'',0,9800,,'',0,13900,,'',0,14700,,'',0,13200,,'',0
-'2064',401,91800,,'',0,44000,,'',0,24500,,'',0
-'2053',1501,90500,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
+'2047',401,91800,,'',0,44000,,'',0,24500,,'',0
+'2293',401,85300,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
+'2660',401,84800,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
+'2661',401,91300,,'',0,31500,,'',0,29100,,'',0
+'2658',1501,90500,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111333 b/src/main/res-current/raw/current_gtfs_schedule_stop_111333
index 8fa58b3b..e417fb25 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111333
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111333
@@ -1,3 +1,4 @@
-'2046',401,85000,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11300,,'',0
-'2048',401,84900,,'',0,10800,,'',0,14400,,'',0,11000,,'',0,10800,,'',0,9800,,'',0,13900,,'',0,14700,,'',0,13200,,'',0
-'2064',401,92000,,'',0,48000,,'',0,20500,,'',0
+'2047',401,92000,,'',0,48000,,'',0,20500,,'',0
+'2293',401,85500,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10500,,'',0
+'2660',401,85000,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
+'2661',401,91500,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111336 b/src/main/res-current/raw/current_gtfs_schedule_stop_111336
index f86b2a11..61aaac1b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111336
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111336
@@ -1,5 +1,6 @@
-'2046',401,85400,,'',0,14600,,'',0,10600,,'',0,11000,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',401,85300,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9800,,'',0,18000,,'',0,10500,,'',0,13000,,'',0
-'2064',401,92500,,'',0,48200,,'',0,20500,,'',0
-'2046',1001,91900,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,70400,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2047',401,92500,,'',0,48200,,'',0,20500,,'',0
+'2293',401,90000,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10800,,'',0,10000,,'',0,19000,,'',0,11600,,'',0,10400,,'',0
+'2660',401,85500,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,11000,,'',0,10000,,'',0,17200,,'',0,10400,,'',0,10100,,'',0
+'2661',401,92100,,'',0,31500,,'',0,29200,,'',0
+'2293',1001,70400,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1001,91800,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111337 b/src/main/res-current/raw/current_gtfs_schedule_stop_111337
index 91ad1ce6..a579fe8b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111337
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111337
@@ -1,7 +1,8 @@
-'2046',400,90100,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,80400,,'',0,5200,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,133600,,'',0,20000,,'',0,38000,,'',0
-'2048',500,80900,0,'Vanier',0,3000,0,'Vanier',0
-'2046',1000,102900,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1000,80400,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114900,,'',0
+'2047',400,133600,,'',0,20000,,'',0,38000,,'',0
+'2293',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124100,,'',0,29200,,'',0,38300,,'',0
+'2293',500,80900,0,'Vanier',0,3000,0,'Vanier',0
+'2047',1000,114900,,'',0
+'2293',1000,80400,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,102800,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111340 b/src/main/res-current/raw/current_gtfs_schedule_stop_111340
index dd9b57fa..2960859a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111340
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111340
@@ -1,4 +1,5 @@
-'2046',400,90900,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,81200,,'',0,9200,,'',0,10900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,134400,,'',0,20000,,'',0,38000,,'',0
-'2053',1500,93400,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2047',400,134400,,'',0,20000,,'',0,38000,,'',0
+'2293',400,81000,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90700,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124800,,'',0,29200,,'',0,38300,,'',0
+'2658',1500,93400,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111347 b/src/main/res-current/raw/current_gtfs_schedule_stop_111347
index 38015d1f..a120b265 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111347
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111347
@@ -1,3 +1,6 @@
-'2046',100,80700,,'',0,9400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2300,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65300,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5800,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,95100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2047',100,95100,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2089',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64500,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80200,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111348 b/src/main/res-current/raw/current_gtfs_schedule_stop_111348
index 3aefee40..b767319c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111348
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111348
@@ -1,3 +1,6 @@
-'2046',100,80700,,'',0,9400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,95200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
+'2047',100,95200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
+'2089',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64600,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
+'2656',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80300,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111349 b/src/main/res-current/raw/current_gtfs_schedule_stop_111349
index c0870237..113c93eb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111349
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111349
@@ -1,7 +1,11 @@
-'2046',100,80800,,'',0,9400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2300,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,65500,,'',0,6000,,'',0,2500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5800,,'',0,1500,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,10000,,'',0,10000,,'',0
-'2064',100,95300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
-'2046',400,91100,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9800,,'',0,11100,,'',0
-'2048',400,81300,,'',0,9300,,'',0,10900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10500,,'',0,13000,,'',0
-'2064',400,134600,,'',0,20000,,'',0,37900,,'',0
-'2053',1500,93600,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2047',100,95300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10400,,'',0
+'2089',100,153600,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64700,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,8300,,'',0,2600,,'',0,7500,,'',0,3500,,'',0,11400,,'',0
+'2656',100,153600,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
+'2660',100,80400,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,94400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
+'2047',400,134600,,'',0,20000,,'',0,37900,,'',0
+'2293',400,81300,,'',0,10300,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11400,,'',0,16400,,'',0
+'2660',400,91100,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12200,,'',0,16100,,'',0
+'2661',400,125200,,'',0,29200,,'',0,38200,,'',0
+'2658',1500,93600,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111352 b/src/main/res-current/raw/current_gtfs_schedule_stop_111352
index 032b4f35..e2ab93b7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111352
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111352
@@ -1,3 +1,6 @@
-'2046',301,81700,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73400,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,154800,,'',0,19800,,'',0
+'2293',301,73400,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,154800,,'',0,19800,,'',0
+'2660',301,81300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111353 b/src/main/res-current/raw/current_gtfs_schedule_stop_111353
index 230337cb..cf30fa96 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111353
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111353
@@ -1,3 +1,6 @@
-'2046',301,81800,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73500,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,154900,,'',0,19800,,'',0
+'2293',301,73500,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,154900,,'',0,19800,,'',0
+'2660',301,81400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111355 b/src/main/res-current/raw/current_gtfs_schedule_stop_111355
index 5bca124c..09170b95 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111355
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111355
@@ -1,3 +1,6 @@
-'2046',301,82000,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73700,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155100,,'',0,19800,,'',0
+'2293',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155100,,'',0,19800,,'',0
+'2660',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111356 b/src/main/res-current/raw/current_gtfs_schedule_stop_111356
index 5bca124c..09170b95 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111356
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111356
@@ -1,3 +1,6 @@
-'2046',301,82000,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73700,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155100,,'',0,19800,,'',0
+'2293',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155100,,'',0,19800,,'',0
+'2660',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111357 b/src/main/res-current/raw/current_gtfs_schedule_stop_111357
index f069ebd8..a4af14a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111357
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111357
@@ -1,3 +1,6 @@
-'2046',301,82100,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73800,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,85400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155200,,'',0,19800,,'',0
+'2293',301,73800,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155200,,'',0,19800,,'',0
+'2660',301,81700,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
+'2661',301,84700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111358 b/src/main/res-current/raw/current_gtfs_schedule_stop_111358
index d9c56a0b..d97e07ef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111358
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111358
@@ -1,3 +1,6 @@
-'2046',301,82200,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,73900,,'',0,8200,,'',0,600,0,'Isfeld S',0,10300,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155300,,'',0,19800,,'',0
+'2293',301,73900,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155300,,'',0,19800,,'',0
+'2660',301,81800,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,84800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111359 b/src/main/res-current/raw/current_gtfs_schedule_stop_111359
index 1238b0c4..ca2eadf8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111359
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111359
@@ -1,3 +1,6 @@
-'2046',301,82300,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74000,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155400,,'',0,19800,,'',0
+'2293',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155400,,'',0,19800,,'',0
+'2660',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111360 b/src/main/res-current/raw/current_gtfs_schedule_stop_111360
index 1238b0c4..ca2eadf8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111360
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111360
@@ -1,3 +1,6 @@
-'2046',301,82300,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74000,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155400,,'',0,19800,,'',0
+'2293',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155400,,'',0,19800,,'',0
+'2660',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111361 b/src/main/res-current/raw/current_gtfs_schedule_stop_111361
index 0e3bf194..671e67fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111361
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111361
@@ -1,3 +1,6 @@
-'2046',301,82400,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,10500,,'',0,7000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74100,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155500,,'',0,19800,,'',0
+'2293',301,74100,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155500,,'',0,19800,,'',0
+'2660',301,82000,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111362 b/src/main/res-current/raw/current_gtfs_schedule_stop_111362
index dcdc5a10..f2f21755 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111362
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111362
@@ -1,3 +1,6 @@
-'2046',301,82500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74200,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155600,,'',0,19800,,'',0
+'2293',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155600,,'',0,19800,,'',0
+'2660',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111363 b/src/main/res-current/raw/current_gtfs_schedule_stop_111363
index dcdc5a10..f2f21755 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111363
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111363
@@ -1,3 +1,6 @@
-'2046',301,82500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74200,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155600,,'',0,19800,,'',0
+'2293',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155600,,'',0,19800,,'',0
+'2660',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111364 b/src/main/res-current/raw/current_gtfs_schedule_stop_111364
index bb522d91..1548c629 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111364
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111364
@@ -1,3 +1,6 @@
-'2046',301,82600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74300,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155700,,'',0,19800,,'',0
+'2293',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155700,,'',0,19800,,'',0
+'2660',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111365 b/src/main/res-current/raw/current_gtfs_schedule_stop_111365
index bb522d91..1548c629 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111365
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111365
@@ -1,3 +1,6 @@
-'2046',301,82600,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74300,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,85900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2047',301,85900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0
+'2089',301,155700,,'',0,19800,,'',0
+'2293',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155700,,'',0,19800,,'',0
+'2660',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111366 b/src/main/res-current/raw/current_gtfs_schedule_stop_111366
index cd90427d..dc062964 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111366
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111366
@@ -1,3 +1,6 @@
-'2046',301,82700,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74400,,'',0,8200,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2047',301,90000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155800,,'',0,19800,,'',0
+'2293',301,74400,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155800,,'',0,19800,,'',0
+'2660',301,82300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111367 b/src/main/res-current/raw/current_gtfs_schedule_stop_111367
index 75d864b6..7da0914c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111367
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111367
@@ -1,4 +1,7 @@
-'2048',101,74600,0,'Downtown',0
-'2046',301,82800,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,10700,,'',0,14500,,'',0,3000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0
-'2048',301,74600,4,'',0,8100,,'',0,10900,,'',0,10000,,'',0,10700,,'',0,10800,,'',0,10400,,'',0,10300,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0
-'2064',301,90100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2293',101,74600,0,'Downtown',0
+'2047',301,90100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',301,155900,,'',0,19800,,'',0
+'2293',301,74600,4,'',0,8200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
+'2656',301,155900,,'',0,19800,,'',0
+'2660',301,82400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
+'2661',301,85400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111368 b/src/main/res-current/raw/current_gtfs_schedule_stop_111368
index 7df6b571..ac1506cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111368
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111368
@@ -1,3 +1,6 @@
-'2046',101,72800,,'',0,3100,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60300,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1300,0,'Downtown',0,200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91900,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2047',101,91900,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2089',101,162900,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55300,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1100,0,'Downtown',0,400,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,162900,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72400,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111369 b/src/main/res-current/raw/current_gtfs_schedule_stop_111369
index ff65593a..326f2761 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111369
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111369
@@ -1,3 +1,6 @@
-'2046',101,72900,,'',0,3000,0,'Downtown',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60400,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,800,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,91900,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
+'2047',101,91900,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,8000,,'',0,5500,,'',0
+'2089',101,163000,,'',0,28500,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11800,,'',0
+'2656',101,163000,,'',0,28500,,'',0,12000,,'',0,10500,,'',0
+'2660',101,72500,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111370 b/src/main/res-current/raw/current_gtfs_schedule_stop_111370
index 3c916119..7c4972ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111370
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111370
@@ -1,5 +1,8 @@
-'2046',101,72900,,'',0,7100,0,'Downtown',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60400,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92000,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
-'2048',301,83200,0,'Isfeld S',0
-'2048',9900,81900,0,'VMP Connector',0
+'2047',101,92000,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5500,,'',0
+'2089',101,163100,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,163100,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72500,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,10000,,'',0
+'2293',301,83300,0,'Isfeld S',0
+'2293',9900,81900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111371 b/src/main/res-current/raw/current_gtfs_schedule_stop_111371
index 9e8b51f6..6da633ac 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111371
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111371
@@ -1,5 +1,8 @@
-'2046',101,72900,,'',0,7100,0,'Downtown',0,4000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,6900,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60400,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92100,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5400,,'',0
-'2048',301,83300,0,'Isfeld S',0
-'2048',9900,82000,0,'VMP Connector',0
+'2047',101,92100,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,5400,,'',0
+'2089',101,163200,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
+'2656',101,163200,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
+'2660',101,72500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
+'2293',301,83400,0,'Isfeld S',0
+'2293',9900,82000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111372 b/src/main/res-current/raw/current_gtfs_schedule_stop_111372
index d318cfe6..6c9ef3a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111372
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111372
@@ -1,5 +1,8 @@
-'2046',101,73100,,'',0,7100,0,'Downtown',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60600,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
-'2048',301,83700,0,'Isfeld S',0
-'2048',9900,82300,0,'VMP Connector',0
+'2047',101,92200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
+'2089',101,163300,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,163300,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72700,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
+'2293',301,83700,0,'Isfeld S',0
+'2293',9900,82300,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111373 b/src/main/res-current/raw/current_gtfs_schedule_stop_111373
index 3f639bf4..e1a6b87e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111373
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111373
@@ -1,4 +1,7 @@
-'2046',100,80200,,'',0,5400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64800,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
-'2048',9901,154800,0,'VMP Connector',0
+'2047',100,94600,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10500,,'',0
+'2089',100,152700,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,152700,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
+'2293',9901,154800,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111374 b/src/main/res-current/raw/current_gtfs_schedule_stop_111374
index dfe91258..374bf859 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111374
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111374
@@ -1,5 +1,8 @@
-'2046',101,73100,,'',0,7100,0,'Downtown',0,4000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,6900,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60600,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92300,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,9400,,'',0
-'2048',301,83700,0,'Isfeld S',0
-'2048',9900,82300,0,'VMP Connector',0
+'2047',101,92300,,'',0,9000,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,8000,,'',0,9400,,'',0
+'2089',101,163400,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
+'2656',101,163400,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
+'2660',101,72700,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
+'2293',301,83800,0,'Isfeld S',0
+'2293',9900,82300,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111375 b/src/main/res-current/raw/current_gtfs_schedule_stop_111375
index 34bdc3e2..0100adf6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111375
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111375
@@ -1,5 +1,8 @@
-'2046',101,73200,,'',0,7100,0,'Downtown',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60700,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92300,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
-'2048',301,83800,0,'Isfeld S',0
-'2048',9900,82400,0,'VMP Connector',0
+'2047',101,92300,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
+'2089',101,163400,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55700,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,163400,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72800,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
+'2293',301,83900,0,'Isfeld S',0
+'2293',9900,82400,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111377 b/src/main/res-current/raw/current_gtfs_schedule_stop_111377
index e7ed2cf4..da9f941c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111377
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111377
@@ -1,4 +1,7 @@
-'2046',101,73300,,'',0,7100,0,'Downtown',0,4000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,6900,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60800,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92500,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
-'2048',9900,82700,0,'VMP Connector',0,1900,0,'VMP Connector',0
+'2047',101,92500,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
+'2089',101,163600,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
+'2656',101,163600,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
+'2660',101,72900,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
+'2293',9900,82700,0,'VMP Connector',0,1900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111378 b/src/main/res-current/raw/current_gtfs_schedule_stop_111378
index 8020e88b..f72e7b5c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111378
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111378
@@ -1,10 +1,14 @@
-'2046',101,73800,,'',0,7200,0,'Downtown',0,3900,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3400,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61300,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3900,,'',0,8000,,'',0,7000,,'',0,3800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2046',601,84200,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64700,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1101,101100,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,32200,,'',0
-'2048',1101,73500,,'',0,27300,,'',0,11500,,'',0,28100,,'',0,12000,,'',0,39900,,'',0,32500,,'',0
-'2048',1201,72600,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2048',9901,160900,0,'VMP Connector',0
+'2047',101,93100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,164300,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,60300,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15500,,'',0
+'2656',101,164300,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
+'2661',101,92100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
+'2047',601,103700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
+'2660',601,84200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
+'2661',601,102700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1101,73500,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
+'2660',1101,100900,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
+'2293',1201,72600,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2293',9901,160900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111379 b/src/main/res-current/raw/current_gtfs_schedule_stop_111379
index 65fe69e2..7ae3880c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111379
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111379
@@ -1,10 +1,14 @@
-'2046',101,73900,,'',0,7200,0,'Downtown',0,3900,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61300,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,1000,,'',0,5500,0,'Downtown',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
-'2046',601,84300,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64800,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1101,101200,,'',0,11500,,'',0,40000,,'',0,39800,,'',0,32200,,'',0
-'2048',1101,73500,,'',0,27400,,'',0,11500,,'',0,28100,,'',0,12000,,'',0,39800,,'',0,32500,,'',0
-'2048',1201,72700,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2048',9901,161000,0,'VMP Connector',0
+'2047',101,93100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
+'2089',101,164400,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,60400,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
+'2656',101,164400,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,92200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
+'2047',601,103800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
+'2660',601,84300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
+'2661',601,102800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1101,73500,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
+'2660',1101,101000,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
+'2293',1201,72700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2293',9901,161000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111380 b/src/main/res-current/raw/current_gtfs_schedule_stop_111380
index 69d58c0f..331888da 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111380
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111380
@@ -1,15 +1,19 @@
-'2046',101,74000,,'',0,7100,0,'Downtown',0,4000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,6900,0,'Downtown',0,3400,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61400,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,1000,,'',0,5500,0,'Downtown',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
-'2046',501,153100,0,'Anfield Ctr',0
-'2048',501,82300,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,300,0,'Anfield Ctr',0,10100,0,'Vanier',0
-'2046',601,84400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64900,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1101,101200,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,32200,,'',0
-'2048',1101,73600,,'',0,27400,,'',0,11500,,'',0,28100,,'',0,12000,,'',0,39800,,'',0,32500,,'',0
-'2046',1201,125600,,'',0,60000,,'',0
-'2048',1201,72700,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2054',1301,102600,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,85900,0,'VMP Connector',0
-'2048',9901,161000,0,'VMP Connector',0
+'2047',101,93200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
+'2089',101,164500,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60500,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5200,0,'Downtown',0,300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
+'2656',101,164500,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
+'2293',501,82300,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
+'2660',501,153500,0,'Vanier',0
+'2047',601,103900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
+'2660',601,84400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
+'2661',601,102900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1101,73600,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
+'2660',1101,101000,,'',0,11800,,'',0,39700,,'',0,39900,,'',0,33000,,'',0
+'2293',1201,72700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,125600,,'',0,60000,,'',0
+'2430',1301,102600,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,85900,0,'VMP Connector',0
+'2293',9901,161000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111381 b/src/main/res-current/raw/current_gtfs_schedule_stop_111381
index 36797662..e0d9ac39 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111381
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111381
@@ -1,14 +1,18 @@
-'2046',100,75100,,'',0,9400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63900,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,1900,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,93500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',500,151900,0,'Vanier',0
-'2048',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'2046',601,81600,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62100,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1100,92600,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,36500,,'',0
-'2048',1100,65600,,'',0,26900,,'',0,11400,,'',0,27900,,'',0,12000,,'',0,40300,,'',0,36600,,'',0
-'2046',1200,113900,,'',0,60000,,'',0
-'2048',1200,60700,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
-'2054',1301,93800,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,80000,0,'VMP Connector',0
+'2047',100,93500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,171800,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,63100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,171800,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
+'2660',100,74600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,92500,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2293',500,151700,0,'Vanier',0,10400,0,'Vanier',0
+'2660',500,152400,0,'Vanier',0
+'2047',601,101100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1100,65600,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
+'2660',1100,92500,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2293',1200,60700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,113800,,'',0,59900,,'',0
+'2430',1301,93800,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,80000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111382 b/src/main/res-current/raw/current_gtfs_schedule_stop_111382
index 32eb041b..42b09cb7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111382
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111382
@@ -1,2 +1,2 @@
-'2046',1001,91700,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,70200,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2293',1001,70200,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1001,91600,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111383 b/src/main/res-current/raw/current_gtfs_schedule_stop_111383
index 3308f848..51d98e0b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111383
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111383
@@ -1,3 +1,3 @@
-'2046',1000,103000,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1000,80500,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2064',1000,115000,,'',0
+'2047',1000,115000,,'',0
+'2293',1000,80500,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
+'2660',1000,102900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111384 b/src/main/res-current/raw/current_gtfs_schedule_stop_111384
index 7180d4c5..8f5a0366 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111384
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111384
@@ -1,6 +1,7 @@
-'2046',601,81900,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62400,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2053',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2048',9900,83300,0,'VMP Connector',0
-'2048',9901,153300,0,'VMP Connector',0
+'2047',601,101400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2293',9900,83300,0,'VMP Connector',0
+'2293',9901,153300,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111385 b/src/main/res-current/raw/current_gtfs_schedule_stop_111385
index 609ec07b..d04cef03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111385
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111385
@@ -1,5 +1,6 @@
-'2046',601,82100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62600,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83500,0,'VMP Connector',0
-'2048',9901,153500,0,'VMP Connector',0
+'2047',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83500,0,'VMP Connector',0
+'2293',9901,153500,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111386 b/src/main/res-current/raw/current_gtfs_schedule_stop_111386
index e784ea52..57b21d28 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111386
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111386
@@ -1,5 +1,6 @@
-'2046',601,82100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62600,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83600,0,'VMP Connector',0
-'2048',9901,153600,0,'VMP Connector',0
+'2047',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83600,0,'VMP Connector',0
+'2293',9901,153600,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111387 b/src/main/res-current/raw/current_gtfs_schedule_stop_111387
index 8ebcb3b1..27f5dadb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111387
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111387
@@ -1,5 +1,6 @@
-'2046',601,82200,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62700,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83600,0,'VMP Connector',0
-'2048',9901,153700,0,'VMP Connector',0
+'2047',601,101700,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83600,0,'VMP Connector',0
+'2293',9901,153700,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111388 b/src/main/res-current/raw/current_gtfs_schedule_stop_111388
index 74b77c5d..670c92d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111388
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111388
@@ -1,5 +1,6 @@
-'2046',601,82300,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62800,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83800,0,'VMP Connector',0
-'2048',9901,153800,0,'VMP Connector',0
+'2047',601,101800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83800,0,'VMP Connector',0
+'2293',9901,153800,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111389 b/src/main/res-current/raw/current_gtfs_schedule_stop_111389
index 96e4219c..9595fcd0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111389
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111389
@@ -1,5 +1,6 @@
-'2046',601,82300,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62800,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83900,0,'VMP Connector',0
-'2048',9901,154000,0,'VMP Connector',0
+'2047',601,101800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83900,0,'VMP Connector',0
+'2293',9901,154000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111390 b/src/main/res-current/raw/current_gtfs_schedule_stop_111390
index 9736d4ed..31c9c7aa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111390
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111390
@@ -1,5 +1,6 @@
-'2046',601,83500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64000,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,82900,0,'VMP Connector',0
-'2048',9901,152900,0,'VMP Connector',0
+'2047',601,103000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83500,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,82900,0,'VMP Connector',0
+'2293',9901,152900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111391 b/src/main/res-current/raw/current_gtfs_schedule_stop_111391
index 74972634..5a3ab4b7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111391
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111391
@@ -1,5 +1,6 @@
-'2046',601,83600,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64100,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,82900,0,'VMP Connector',0
-'2048',9901,153000,0,'VMP Connector',0
+'2047',601,103100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,82900,0,'VMP Connector',0
+'2293',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111392 b/src/main/res-current/raw/current_gtfs_schedule_stop_111392
index 50ebc47f..2a6fed85 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111392
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111392
@@ -1,5 +1,6 @@
-'2046',601,83600,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64100,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83000,0,'VMP Connector',0
-'2048',9901,153000,0,'VMP Connector',0
+'2047',601,103100,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83000,0,'VMP Connector',0
+'2293',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111393 b/src/main/res-current/raw/current_gtfs_schedule_stop_111393
index eb010349..c64b9d61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111393
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111393
@@ -1,5 +1,6 @@
-'2046',601,83700,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64200,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83000,0,'VMP Connector',0
-'2048',9901,153000,0,'VMP Connector',0
+'2047',601,103200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83000,0,'VMP Connector',0
+'2293',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111394 b/src/main/res-current/raw/current_gtfs_schedule_stop_111394
index 2f936696..b2576a05 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111394
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111394
@@ -1,5 +1,6 @@
-'2046',601,83700,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64200,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83000,0,'VMP Connector',0
-'2048',9901,153100,0,'VMP Connector',0
+'2047',601,103200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83000,0,'VMP Connector',0
+'2293',9901,153100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111395 b/src/main/res-current/raw/current_gtfs_schedule_stop_111395
index aa57aa1f..ee2cae66 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111395
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111395
@@ -1,5 +1,6 @@
-'2046',601,83900,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64400,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83200,0,'VMP Connector',0
-'2048',9901,153200,0,'VMP Connector',0
+'2047',601,103400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83200,0,'VMP Connector',0
+'2293',9901,153200,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111396 b/src/main/res-current/raw/current_gtfs_schedule_stop_111396
index feb072c3..398a0633 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111396
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111396
@@ -1,5 +1,6 @@
-'2046',601,84000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64500,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103500,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83300,0,'VMP Connector',0
-'2048',9901,153300,0,'VMP Connector',0
+'2047',601,103500,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
+'2660',601,84000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
+'2661',601,102500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83300,0,'VMP Connector',0
+'2293',9901,153300,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111397 b/src/main/res-current/raw/current_gtfs_schedule_stop_111397
index 37e0abaa..ebda0e46 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111397
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111397
@@ -1,5 +1,6 @@
-'2046',701,84700,,'',0,21000,0,'Arden',0,25000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85200,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64600,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,104700,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2047',801,104700,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111398 b/src/main/res-current/raw/current_gtfs_schedule_stop_111398
index a071dd57..8c50bc2d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111398
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111398
@@ -1,5 +1,6 @@
-'2046',701,84700,,'',0,21000,0,'Arden',0,25000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85400,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64800,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,104900,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2047',801,104900,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111399 b/src/main/res-current/raw/current_gtfs_schedule_stop_111399
index fb7f6105..5330be7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111399
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111399
@@ -1,5 +1,6 @@
-'2046',701,84800,,'',0,21000,0,'Arden',0,25000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,65800,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85500,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64900,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105000,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,65800,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85000,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
+'2047',801,105000,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111400 b/src/main/res-current/raw/current_gtfs_schedule_stop_111400
index a693b5bd..6ca81ef1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111400
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111400
@@ -1,2 +1,2 @@
-'2046',701,84900,,'',0,21000,0,'Arden',0,25000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
+'2293',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111401 b/src/main/res-current/raw/current_gtfs_schedule_stop_111401
index a693b5bd..6ca81ef1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111401
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111401
@@ -1,2 +1,2 @@
-'2046',701,84900,,'',0,21000,0,'Arden',0,25000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
+'2293',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111402 b/src/main/res-current/raw/current_gtfs_schedule_stop_111402
index 07f770a9..b3d14d35 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111402
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111402
@@ -1,2 +1,2 @@
-'2046',701,85100,,'',0,25000,0,'Arden',0,21000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
+'2293',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111404 b/src/main/res-current/raw/current_gtfs_schedule_stop_111404
index 20d37d2a..9389feaa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111404
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111404
@@ -1,5 +1,6 @@
-'2046',701,85300,,'',0,24900,0,'Arden',0,21000,0,'Arden',0,24300,,'',0,15200,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70200,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11900,,'',0,8200,,'',0,18700,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85500,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64900,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105000,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,70200,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85500,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
+'2047',801,105000,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111405 b/src/main/res-current/raw/current_gtfs_schedule_stop_111405
index 88d287a9..1ee8c91b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111405
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111405
@@ -1,5 +1,6 @@
-'2046',701,85400,,'',0,24800,0,'Arden',0,21000,0,'Arden',0,24400,,'',0,15100,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70200,0,'Arden',0,5100,,'',0,15400,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,12000,,'',0,8200,,'',0,18600,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85600,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65000,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105100,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,70200,0,'Arden',0,5100,,'',0,15400,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,12000,,'',0,8200,,'',0,10000,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85600,,'',0,25100,0,'Arden',0,20700,0,'Arden',0,23500,,'',0,16300,0,'Arden',0,33000,0,'Arden',0
+'2047',801,105100,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64800,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90200,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104300,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111406 b/src/main/res-current/raw/current_gtfs_schedule_stop_111406
index 8e903ba0..f0537935 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111406
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111406
@@ -1,5 +1,6 @@
-'2046',701,85500,,'',0,70200,,'',0
-'2048',701,75400,,'',0,78900,,'',0,8200,,'',0
-'2046',801,85700,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65100,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105200,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,75400,,'',0,78900,,'',0,8200,,'',0
+'2660',701,85700,,'',0,69300,,'',0
+'2047',801,105200,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111407 b/src/main/res-current/raw/current_gtfs_schedule_stop_111407
index 99ab60ca..da65a539 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111407
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111407
@@ -1,2 +1,2 @@
-'2046',701,90000,,'',0,70200,,'',0
-'2048',701,75900,,'',0,78900,,'',0,8200,,'',0
+'2293',701,75900,,'',0,78900,,'',0,8200,,'',0
+'2660',701,90200,,'',0,65300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111408 b/src/main/res-current/raw/current_gtfs_schedule_stop_111408
index e77b7afc..ef9c0ef2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111408
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111408
@@ -1,5 +1,6 @@
-'2046',701,90100,,'',0,70200,,'',0
-'2048',701,80000,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90100,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65500,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105600,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80000,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90300,,'',0,65300,,'',0
+'2047',801,105600,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111409 b/src/main/res-current/raw/current_gtfs_schedule_stop_111409
index b10af6e2..203aa03f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111409
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111409
@@ -1,5 +1,6 @@
-'2046',701,90100,,'',0,70200,,'',0
-'2048',701,80000,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90200,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65600,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105700,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80000,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90300,,'',0,65300,,'',0
+'2047',801,105700,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90800,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111410 b/src/main/res-current/raw/current_gtfs_schedule_stop_111410
index 0c3cbf4a..3822e3c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111410
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111410
@@ -1,5 +1,6 @@
-'2046',701,90200,,'',0,70200,,'',0
-'2048',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90300,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65700,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105800,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80100,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90400,,'',0,65300,,'',0
+'2047',801,105800,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111411 b/src/main/res-current/raw/current_gtfs_schedule_stop_111411
index 0c3cbf4a..3822e3c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111411
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111411
@@ -1,5 +1,6 @@
-'2046',701,90200,,'',0,70200,,'',0
-'2048',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90300,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65700,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105800,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80100,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90400,,'',0,65300,,'',0
+'2047',801,105800,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111412 b/src/main/res-current/raw/current_gtfs_schedule_stop_111412
index e1244dae..22ef8fc7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111412
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111412
@@ -1,3 +1,4 @@
-'2046',800,94900,,'',0,11000,,'',0,15600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62800,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95400,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95400,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,62600,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111413 b/src/main/res-current/raw/current_gtfs_schedule_stop_111413
index 8d7d69ed..7e574e50 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111413
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111413
@@ -1,5 +1,6 @@
-'2046',701,90200,,'',0,70200,,'',0
-'2048',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90400,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65800,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105900,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80100,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90400,,'',0,65300,,'',0
+'2047',801,105900,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111414 b/src/main/res-current/raw/current_gtfs_schedule_stop_111414
index 9c148b82..288d7d83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111414
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111414
@@ -1,5 +1,6 @@
-'2046',701,90300,,'',0,70200,,'',0
-'2048',701,80200,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90400,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65800,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105900,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',701,80200,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90500,,'',0,65300,,'',0
+'2047',801,105900,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111415 b/src/main/res-current/raw/current_gtfs_schedule_stop_111415
index aced4fdd..b2cfab3a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111415
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111415
@@ -1,3 +1,4 @@
-'2046',801,85200,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64600,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,104700,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2047',801,104700,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111416 b/src/main/res-current/raw/current_gtfs_schedule_stop_111416
index 0eeb7f13..959ebd6d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111416
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111416
@@ -1,3 +1,4 @@
-'2046',801,85300,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64700,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,104800,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2047',801,104800,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111417 b/src/main/res-current/raw/current_gtfs_schedule_stop_111417
index 78a7207d..254699c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111417
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111417
@@ -1,3 +1,4 @@
-'2046',800,95500,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63400,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,100000,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2047',800,100000,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
+'2660',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111418 b/src/main/res-current/raw/current_gtfs_schedule_stop_111418
index c1cf822f..242f7275 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111418
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111418
@@ -1,3 +1,4 @@
-'2046',801,85700,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65100,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105200,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2047',801,105200,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111419 b/src/main/res-current/raw/current_gtfs_schedule_stop_111419
index beb35a06..ed646375 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111419
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111419
@@ -1,3 +1,4 @@
-'2046',801,85800,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65200,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105300,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2047',801,105300,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,65000,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90400,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104500,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111420 b/src/main/res-current/raw/current_gtfs_schedule_stop_111420
index 2852cb91..fb660052 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111420
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111420
@@ -1,3 +1,4 @@
-'2046',801,85900,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65300,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105400,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2047',801,105400,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,65100,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90500,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104600,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111421 b/src/main/res-current/raw/current_gtfs_schedule_stop_111421
index 6b33d9f4..18ab717e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111421
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111421
@@ -1,3 +1,4 @@
-'2046',801,90000,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65400,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105500,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2047',801,105500,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90600,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111422 b/src/main/res-current/raw/current_gtfs_schedule_stop_111422
index ed80f52a..c189cf7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111422
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111422
@@ -1,3 +1,4 @@
-'2046',801,90100,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65500,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,105600,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2047',801,105600,,'',0,24500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111423 b/src/main/res-current/raw/current_gtfs_schedule_stop_111423
index 1340d442..be2a46b6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111423
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111423
@@ -1,3 +1,4 @@
-'2046',800,94800,,'',0,11000,,'',0,15600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62700,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95300,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
+'2047',800,95300,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
+'2293',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111424 b/src/main/res-current/raw/current_gtfs_schedule_stop_111424
index c28442a5..f3f5c75b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111424
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111424
@@ -1,3 +1,4 @@
-'2046',800,95000,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62900,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95500,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95500,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111425 b/src/main/res-current/raw/current_gtfs_schedule_stop_111425
index c28442a5..f3f5c75b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111425
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111425
@@ -1,3 +1,4 @@
-'2046',800,95000,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62900,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95500,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95500,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111426 b/src/main/res-current/raw/current_gtfs_schedule_stop_111426
index 14c0f05d..8c73e4f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111426
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111426
@@ -1,3 +1,4 @@
-'2046',800,95100,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63000,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95600,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95600,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,62800,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111427 b/src/main/res-current/raw/current_gtfs_schedule_stop_111427
index f5b26e5e..d3df51a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111427
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111427
@@ -1,3 +1,4 @@
-'2046',800,95200,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63100,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95700,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95700,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,62900,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83800,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111428 b/src/main/res-current/raw/current_gtfs_schedule_stop_111428
index 7bbef38c..6d8af5eb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111428
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111428
@@ -1,3 +1,4 @@
-'2046',800,95300,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63200,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95800,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95800,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111429 b/src/main/res-current/raw/current_gtfs_schedule_stop_111429
index 7bbef38c..6d8af5eb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111429
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111429
@@ -1,3 +1,4 @@
-'2046',800,95300,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63200,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95800,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2047',800,95800,,'',0,20100,,'',0,24500,,'',0,15500,,'',0,27900,,'',0
+'2293',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111430 b/src/main/res-current/raw/current_gtfs_schedule_stop_111430
index 4a7cb68d..fdc379bc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111430
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111430
@@ -1,3 +1,4 @@
-'2046',800,95400,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63300,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,95900,,'',0,24100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2047',800,95900,,'',0,24100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63100,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
+'2660',800,84000,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94700,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111431 b/src/main/res-current/raw/current_gtfs_schedule_stop_111431
index 78a7207d..254699c4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111431
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111431
@@ -1,3 +1,4 @@
-'2046',800,95500,,'',0,15000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,63400,,'',0,11300,,'',0,15500,,'',0,5500,,'',0,10200,,'',0,14800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,15000,,'',0
-'2064',800,100000,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2047',800,100000,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
+'2660',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111432 b/src/main/res-current/raw/current_gtfs_schedule_stop_111432
index 020990db..daa9eaba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111432
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111432
@@ -1,5 +1,6 @@
-'2046',701,110400,0,'Arden',0,21000,0,'Arden',0,39500,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70400,0,'Arden',0,20500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,38800,0,'Arden',0,23200,0,'Arden',0
-'2046',800,100000,,'',0,11000,,'',0,11600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,18000,,'',0
-'2048',800,63900,,'',0,11300,,'',0,15500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,16800,,'',0,19000,,'',0
-'2064',800,100500,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',701,70400,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,110900,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2047',800,100500,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,23900,,'',0
+'2293',800,63700,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
+'2660',800,84600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
+'2661',800,95300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111435 b/src/main/res-current/raw/current_gtfs_schedule_stop_111435
index 132f2b76..d5b9f48d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111435
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111435
@@ -1,4 +1,5 @@
-'2046',1001,93800,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,72500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,105600,,'',0,68000,,'',0
-'2054',1401,85100,,'',0,25400,,'',0,44600,,'',0
+'2047',1001,105600,,'',0,68000,,'',0
+'2293',1001,72500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,93900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,105600,,'',0,68200,,'',0
+'2430',1401,85100,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111437 b/src/main/res-current/raw/current_gtfs_schedule_stop_111437
index 33da2bf1..2212ba25 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111437
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111437
@@ -1,3 +1,4 @@
-'2046',1001,95000,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1001,73700,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,110800,,'',0,64000,,'',0
+'2047',1001,110800,,'',0,64000,,'',0
+'2293',1001,73700,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2660',1001,95100,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
+'2661',1001,110800,,'',0,64200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111438 b/src/main/res-current/raw/current_gtfs_schedule_stop_111438
index 5f944dde..a73daa52 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111438
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111438
@@ -1,6 +1,8 @@
-'2046',1000,100000,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2046',1001,95300,4,'',0,40000,4,'',0,40000,4,'',0,37500,4,'',0
-'2048',1000,74500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2048',1001,74000,4,'',0,7500,4,'',0,13900,4,'',0,40000,4,'',0,40000,4,'',0,37600,4,'',0
-'2064',1000,112000,,'',0,68000,0,'Downtown',0
-'2064',1001,111100,4,'',0,64000,4,'',0
+'2047',1000,112000,,'',0,68000,0,'Downtown',0
+'2047',1001,111100,4,'',0,64000,4,'',0
+'2293',1000,74500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
+'2293',1001,74000,4,'',0,7500,4,'',0,13900,4,'',0,40000,4,'',0,40000,4,'',0,37600,4,'',0
+'2660',1000,95900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
+'2660',1001,95400,4,'',0,40000,4,'',0,40000,4,'',0,37600,4,'',0
+'2661',1000,111600,0,'Downtown',0,68400,0,'Downtown',0
+'2661',1001,111100,4,'',0,64200,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111442 b/src/main/res-current/raw/current_gtfs_schedule_stop_111442
index 0c0fc2bb..6ed91af2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111442
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111442
@@ -1,4 +1,5 @@
-'2046',1000,101800,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,80300,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,113800,,'',0,68000,0,'Downtown',0
-'2054',1400,90600,,'',0,21400,,'',0,48600,,'',0
+'2047',1000,113800,,'',0,68000,0,'Downtown',0
+'2293',1000,80300,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,101700,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113400,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90600,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111448 b/src/main/res-current/raw/current_gtfs_schedule_stop_111448
index b8c7e3a4..d43a9766 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111448
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111448
@@ -1,4 +1,4 @@
-'2046',1100,93400,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,36400,,'',0
-'2048',1100,70300,,'',0,23000,,'',0,11400,,'',0,28000,,'',0,12000,,'',0,40100,,'',0,36500,,'',0
-'2054',1301,94600,,'',0,25400,,'',0,44600,,'',0
-'2048',9900,80500,0,'VMP Connector',0
+'2293',1100,70300,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
+'2660',1100,93300,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
+'2430',1301,94600,,'',0,25400,,'',0,44600,,'',0
+'2293',9900,80500,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111449 b/src/main/res-current/raw/current_gtfs_schedule_stop_111449
index 7ab31fcb..625e8f27 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111449
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111449
@@ -1,2 +1,2 @@
-'2046',1100,94100,,'',0,11600,,'',0,40000,,'',0,39800,,'',0,36400,,'',0
-'2048',1100,94000,,'',0,11500,,'',0,28000,,'',0,12000,,'',0,40000,,'',0,36500,,'',0
+'2293',1100,94000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
+'2660',1100,94000,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111450 b/src/main/res-current/raw/current_gtfs_schedule_stop_111450
index 3d48d2e2..250bcef4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111450
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111450
@@ -1,3 +1,3 @@
-'2046',1100,94900,,'',0,15600,,'',0,40000,,'',0,39800,,'',0,32400,,'',0
-'2048',1100,71500,,'',0,23300,,'',0,15500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
-'2048',9900,81100,0,'VMP Connector',0
+'2293',1100,71500,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1100,94800,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
+'2293',9900,81100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111451 b/src/main/res-current/raw/current_gtfs_schedule_stop_111451
index 09ae5b98..c0b73d44 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111451
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111451
@@ -1,3 +1,3 @@
-'2046',1100,95000,,'',0,15600,,'',0,40000,,'',0,39800,,'',0,32400,,'',0
-'2048',1100,71600,,'',0,23300,,'',0,15500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
-'2048',9900,81200,0,'VMP Connector',0
+'2293',1100,71600,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1100,94900,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
+'2293',9900,81200,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111452 b/src/main/res-current/raw/current_gtfs_schedule_stop_111452
index ee524b26..f90f7111 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111452
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111452
@@ -1,4 +1,4 @@
-'2046',1100,95400,4,'',0,15600,4,'',0,40000,4,'',0,39800,4,'',0,32400,4,'',0
-'2046',1101,95500,,'',0,15500,,'',0,40000,,'',0,40000,,'',0,32200,,'',0
-'2048',1100,72000,4,'',0,23300,4,'',0,15500,4,'',0,24000,4,'',0,16000,4,'',0,40000,4,'',0,32500,4,'',0
-'2048',1101,72000,,'',0,23300,,'',0,15500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
+'2293',1100,72000,4,'',0,23300,4,'',0,15800,4,'',0,23700,4,'',0,16000,4,'',0,40000,4,'',0,33000,4,'',0
+'2293',1101,72000,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1100,95300,4,'',0,15800,4,'',0,39700,4,'',0,40000,4,'',0,33000,4,'',0
+'2660',1101,95300,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111455 b/src/main/res-current/raw/current_gtfs_schedule_stop_111455
index 609ec07b..d04cef03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111455
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111455
@@ -1,5 +1,6 @@
-'2046',601,82100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62600,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83500,0,'VMP Connector',0
-'2048',9901,153500,0,'VMP Connector',0
+'2047',601,101600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83500,0,'VMP Connector',0
+'2293',9901,153500,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111456 b/src/main/res-current/raw/current_gtfs_schedule_stop_111456
index 239dae46..17d34629 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111456
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111456
@@ -1,6 +1,7 @@
-'2046',601,81900,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62400,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2053',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2048',9900,83400,0,'VMP Connector',0
-'2048',9901,153400,0,'VMP Connector',0
+'2047',601,101400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2293',9900,83400,0,'VMP Connector',0
+'2293',9901,153400,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111457 b/src/main/res-current/raw/current_gtfs_schedule_stop_111457
index 29c2b477..81da815f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111457
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111457
@@ -1,2 +1,2 @@
-'2046',701,85000,,'',0,25000,0,'Arden',0,21000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70000,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
+'2293',701,70000,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85200,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111459 b/src/main/res-current/raw/current_gtfs_schedule_stop_111459
index e5d1358c..94480886 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111459
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111459
@@ -1,7 +1,8 @@
-'2046',400,90100,,'',0,10200,,'',0,10800,,'',0,10800,,'',0,10600,,'',0,11000,,'',0,18000,,'',0,9900,,'',0,11100,,'',0
-'2048',400,80400,,'',0,5200,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,17800,,'',0,10600,,'',0,13000,,'',0
-'2064',400,133600,,'',0,20000,,'',0,38000,,'',0
-'2048',500,80800,0,'Vanier',0,3000,0,'Vanier',0
-'2046',1000,102800,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1000,80300,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114800,,'',0
+'2047',400,133600,,'',0,20000,,'',0,38000,,'',0
+'2293',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
+'2660',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
+'2661',400,124100,,'',0,29200,,'',0,38300,,'',0
+'2293',500,80800,0,'Vanier',0,3000,0,'Vanier',0
+'2047',1000,114800,,'',0
+'2293',1000,80300,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,102700,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111461 b/src/main/res-current/raw/current_gtfs_schedule_stop_111461
index c850c717..d618c95e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111461
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111461
@@ -1,2 +1,2 @@
-'2046',701,85600,,'',0,70200,,'',0
-'2048',701,75500,,'',0,78900,,'',0,8200,,'',0
+'2293',701,75500,,'',0,78900,,'',0,8200,,'',0
+'2660',701,85800,,'',0,69300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111463 b/src/main/res-current/raw/current_gtfs_schedule_stop_111463
index aa9bd7fc..9eac69d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111463
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111463
@@ -1,5 +1,6 @@
-'2046',601,83800,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,64300,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,103300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,83100,0,'VMP Connector',0
-'2048',9901,153100,0,'VMP Connector',0
+'2047',601,103300,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,64300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,102300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,83100,0,'VMP Connector',0
+'2293',9901,153100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111464 b/src/main/res-current/raw/current_gtfs_schedule_stop_111464
index 07f770a9..b3d14d35 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111464
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111464
@@ -1,2 +1,2 @@
-'2046',701,85100,,'',0,25000,0,'Arden',0,21000,0,'Arden',0,24200,,'',0,15300,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11800,,'',0,8200,,'',0,18800,0,'Arden',0,23200,0,'Arden',0
+'2293',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111465 b/src/main/res-current/raw/current_gtfs_schedule_stop_111465
index 80982fd8..40224036 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111465
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111465
@@ -1,2 +1,2 @@
-'2046',701,85200,,'',0,24900,0,'Arden',0,21000,0,'Arden',0,24300,,'',0,15200,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11900,,'',0,8200,,'',0,18700,0,'Arden',0,23200,0,'Arden',0
+'2293',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111467 b/src/main/res-current/raw/current_gtfs_schedule_stop_111467
index 99ab60ca..da65a539 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111467
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111467
@@ -1,2 +1,2 @@
-'2046',701,90000,,'',0,70200,,'',0
-'2048',701,75900,,'',0,78900,,'',0,8200,,'',0
+'2293',701,75900,,'',0,78900,,'',0,8200,,'',0
+'2660',701,90200,,'',0,65300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111473 b/src/main/res-current/raw/current_gtfs_schedule_stop_111473
index 838b00e6..465e863b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111473
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111473
@@ -1,6 +1,7 @@
-'2046',601,82000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62500,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101500,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2053',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2048',9900,83400,0,'VMP Connector',0
-'2048',9901,153400,0,'VMP Connector',0
+'2047',601,101500,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2293',9900,83400,0,'VMP Connector',0
+'2293',9901,153400,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111474 b/src/main/res-current/raw/current_gtfs_schedule_stop_111474
index 76fedbfb..09ffebe3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111474
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111474
@@ -1,4 +1,7 @@
-'2046',101,74500,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61800,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93800,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83200,,'',0,21400,,'',0,48600,,'',0
+'2047',101,93800,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165100,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165100,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83200,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111475 b/src/main/res-current/raw/current_gtfs_schedule_stop_111475
index 7e5c3451..89e02fed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111475
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111475
@@ -1,3 +1,3 @@
-'2046',1101,100500,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,32200,,'',0
-'2048',1101,73000,,'',0,27300,,'',0,11500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
-'2048',9901,160300,0,'VMP Connector',0
+'2293',1101,73000,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1101,100300,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
+'2293',9901,160300,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111476 b/src/main/res-current/raw/current_gtfs_schedule_stop_111476
index 565ea786..1fa78f9c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111476
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111476
@@ -1,11 +1,15 @@
-'2046',100,75800,,'',0,9400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64500,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,1900,,'',0,6000,,'',0,4000,,'',0,6000,,'',0,1500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,7200,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
-'2046',601,83300,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63800,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1100,93300,,'',0,11500,,'',0,40000,,'',0,39900,,'',0,36400,,'',0
-'2048',1100,70200,,'',0,23000,,'',0,11400,,'',0,28000,,'',0,12000,,'',0,40100,,'',0,36500,,'',0
-'2054',1301,94500,,'',0,21400,,'',0,48600,,'',0
-'2053',1500,92000,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2053',1501,91700,4,'',0,4000,4,'',0,8000,4,'',0,28000,4,'',0,4000,4,'',0,8000,4,'',0
+'2047',100,94200,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,172500,,'',0,27500,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,63700,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,172500,,'',0,27500,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75300,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
+'2047',601,102800,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,101800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1100,70200,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
+'2660',1100,93200,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
+'2430',1301,94500,,'',0,21400,,'',0,48600,,'',0
+'2658',1500,92000,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
+'2658',1501,91700,4,'',0,4000,4,'',0,8000,4,'',0,28000,4,'',0,4000,4,'',0,8000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111477 b/src/main/res-current/raw/current_gtfs_schedule_stop_111477
index 1a2c22d9..ff45ad4f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111477
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111477
@@ -1,3 +1,6 @@
-'2046',100,75900,,'',0,9400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,6400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,64600,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1400,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,1900,,'',0,6000,,'',0,4000,,'',0,6000,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,7200,,'',0,8000,,'',0,3000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,94300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2047',100,94300,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10500,,'',0
+'2089',100,172600,,'',0,27500,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
+'2293',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,172600,,'',0,27500,,'',0,12000,,'',0,10500,,'',0
+'2660',100,75400,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
+'2661',100,93300,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111478 b/src/main/res-current/raw/current_gtfs_schedule_stop_111478
index 18770af8..406e08fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111478
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111478
@@ -1,4 +1,7 @@
-'2046',101,73300,,'',0,7100,0,'Downtown',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60800,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92400,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
-'2048',9900,82600,0,'VMP Connector',0,1900,0,'VMP Connector',0
+'2047',101,92400,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
+'2089',101,163500,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,163500,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72900,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
+'2293',9900,82600,0,'VMP Connector',0,1900,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111479 b/src/main/res-current/raw/current_gtfs_schedule_stop_111479
index 405c7054..2f5f1610 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111479
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111479
@@ -1,3 +1,3 @@
-'2048',301,84100,4,'',0
-'2048',9900,82600,0,'VMP Connector',0,1800,0,'VMP Connector',0
-'2048',9901,154600,0,'VMP Connector',0
+'2293',301,84100,4,'',0
+'2293',9900,82600,0,'VMP Connector',0,1800,0,'VMP Connector',0
+'2293',9901,154600,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111480 b/src/main/res-current/raw/current_gtfs_schedule_stop_111480
index c9699144..328a1461 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111480
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111480
@@ -1,3 +1,4 @@
-'2046',601,82900,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63400,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2047',601,102400,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,101400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111481 b/src/main/res-current/raw/current_gtfs_schedule_stop_111481
index 5cad5bb9..3837319f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111481
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111481
@@ -1,5 +1,6 @@
-'2046',601,82400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,62900,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,101900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2048',9900,84000,0,'VMP Connector',0
-'2048',9901,154200,0,'VMP Connector',0
+'2047',601,101900,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,62900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,100900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',9900,84000,0,'VMP Connector',0
+'2293',9901,154200,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111483 b/src/main/res-current/raw/current_gtfs_schedule_stop_111483
index f9dfbe57..25fdcd7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111483
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111483
@@ -1,4 +1,5 @@
-'2046',1000,102100,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,75600,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114100,,'',0,68000,0,'Downtown',0
-'2054',1400,90900,,'',0,21400,,'',0,48600,,'',0
+'2047',1000,114100,,'',0,68000,0,'Downtown',0
+'2293',1000,75600,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,102000,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2661',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
+'2430',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111486 b/src/main/res-current/raw/current_gtfs_schedule_stop_111486
index fa40fced..1039a86c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111486
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111486
@@ -1,34 +1,37 @@
-'2046',101,81400,4,'',0,120900,4,'',0
-'2048',101,80300,4,'',0
-'2046',500,151800,0,'Vanier',0
-'2048',500,151600,0,'Vanier',0,10400,0,'Vanier',0
-'2048',501,82600,4,'',0,3000,4,'',0,67500,4,'',0,10400,4,'',0
-'2046',601,81500,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7300,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
-'2048',601,62000,,'',0,3200,4,'',0,6000,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,7100,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,2300,,'',0,3200,4,'',0,7300,,'',0,7200,4,'',0,2300,,'',0,3200,4,'',0
-'2064',601,101000,,'',0,3200,4,'',0,17300,,'',0,3200,4,'',0,17300,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0
-'2046',701,84500,,'',0,21000,0,'Arden',0,5200,4,'',0,19800,0,'Arden',0,1200,4,'',0,23000,,'',0,15300,0,'Arden',0,1200,4,'',0,31800,0,'Arden',0,1200,4,'',0
-'2048',701,65500,0,'Arden',0,5200,4,'',0,3700,,'',0,15600,0,'Arden',0,1200,4,'',0,10200,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,18900,0,'Arden',0,1200,4,'',0,10600,,'',0,8200,,'',0,18800,0,'Arden',0,1200,4,'',0,22000,0,'Arden',0,1200,4,'',0
-'2046',800,100200,4,'',0,11000,4,'',0,11600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,11000,4,'',0,16900,4,'',0,10500,4,'',0,9500,4,'',0,18000,4,'',0
-'2046',801,85000,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',800,64100,4,'',0,11300,4,'',0,15500,4,'',0,9500,4,'',0,10200,4,'',0,10800,4,'',0,11100,4,'',0,10900,4,'',0,8800,4,'',0,10500,4,'',0,9100,4,'',0,12600,4,'',0,16800,4,'',0,19000,4,'',0
-'2048',801,64400,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',800,100700,4,'',0,20100,4,'',0,20500,4,'',0,19500,4,'',0,23900,4,'',0
-'2064',801,104500,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
-'2046',1000,103600,4,'',0,40000,4,'',0,40000,4,'',0,37500,4,'',0
-'2046',1001,91500,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1000,81100,4,'',0,1000,4,'',0,3500,4,'',0,17900,4,'',0,40000,4,'',0,40000,4,'',0,37100,4,'',0
-'2048',1001,70000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2064',1000,115600,4,'',0
-'2046',1100,92500,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,36500,,'',0
-'2046',1101,101500,4,'',0,11500,4,'',0,40000,4,'',0,39800,4,'',0,32200,4,'',0
-'2048',1100,65500,,'',0,26900,,'',0,11400,,'',0,27900,,'',0,12000,,'',0,40300,,'',0,36600,,'',0
-'2048',1101,73800,4,'',0,27400,4,'',0,11500,4,'',0,28200,4,'',0,12000,4,'',0,39700,4,'',0,32500,4,'',0
-'2046',1200,113800,,'',0,60000,,'',0
-'2046',1201,125900,4,'',0,60000,4,'',0
-'2048',1200,60600,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
-'2048',1201,73000,4,'',0,17000,4,'',0,40000,4,'',0,20000,4,'',0,30000,4,'',0,10000,4,'',0
-'2054',1301,93700,,'',0,9200,4,'',0,12200,,'',0,9200,4,'',0,39400,,'',0,9200,4,'',0
-'2054',1400,92400,4,'',0,21400,4,'',0,48700,4,'',0
-'2054',1401,83000,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,75900,0,'VMP Connector',0,14300,4,'',0
-'2048',9901,161300,4,'',0
+'2293',101,80300,4,'',0
+'2293',500,151600,0,'Vanier',0,10400,0,'Vanier',0
+'2293',501,82600,4,'',0,3000,4,'',0,67500,4,'',0,200,4,'',0,10200,4,'',0
+'2660',500,152300,0,'Vanier',0
+'2660',501,153800,4,'',0
+'2047',601,101000,,'',0,3200,4,'',0,17300,,'',0,3200,4,'',0,17300,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0
+'2293',601,62000,,'',0,3200,4,'',0,5800,,'',0,3200,4,'',0,7500,,'',0,3200,4,'',0,7100,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,7300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
+'2660',601,81500,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
+'2661',601,100000,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0
+'2293',701,65500,0,'Arden',0,5200,4,'',0,3700,,'',0,15600,0,'Arden',0,1200,4,'',0,10300,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,9300,0,'Arden',0,1200,4,'',0,18300,0,'Arden',0,1200,4,'',0,10600,,'',0,8200,,'',0,10200,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,20600,0,'Arden',0,1200,4,'',0
+'2660',701,84700,,'',0,25300,0,'Arden',0,1200,4,'',0,19500,0,'Arden',0,1200,4,'',0,22100,,'',0,16500,0,'Arden',0,1200,4,'',0,31800,0,'Arden',0,1200,4,'',0
+'2047',800,100700,4,'',0,20100,4,'',0,20500,4,'',0,19500,4,'',0,23900,4,'',0
+'2047',801,104500,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',800,63900,4,'',0,11500,4,'',0,15500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9400,4,'',0,3600,4,'',0,15500,4,'',0,11500,4,'',0,18000,4,'',0
+'2293',801,64200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',800,84800,4,'',0,11000,4,'',0,15500,4,'',0,11100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,9900,4,'',0,15500,4,'',0,12000,4,'',0,18000,4,'',0
+'2660',801,85600,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',800,95500,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0,27500,4,'',0
+'2661',801,103700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
+'2047',1000,115600,4,'',0
+'2293',1000,81100,4,'',0,1000,4,'',0,3500,4,'',0,17900,4,'',0,40000,4,'',0,40000,4,'',0,37100,4,'',0
+'2293',1001,70000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1000,103500,4,'',0,40000,4,'',0,40000,4,'',0,37100,4,'',0
+'2660',1001,91400,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2293',1100,65500,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
+'2293',1101,73800,4,'',0,27400,4,'',0,11800,4,'',0,27900,4,'',0,12000,4,'',0,39700,4,'',0,33000,4,'',0
+'2660',1100,92400,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
+'2660',1101,101300,4,'',0,11700,4,'',0,39800,4,'',0,39800,4,'',0,33000,4,'',0
+'2293',1200,60600,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2293',1201,73000,4,'',0,17000,4,'',0,40200,4,'',0,19800,4,'',0,30000,4,'',0,10200,4,'',0
+'2660',1200,113700,,'',0,59900,,'',0
+'2660',1201,125900,4,'',0,60000,4,'',0
+'2430',1301,93700,,'',0,9200,4,'',0,12200,,'',0,9200,4,'',0,39400,,'',0,9200,4,'',0
+'2430',1400,92400,4,'',0,21400,4,'',0,48700,4,'',0
+'2430',1401,83000,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,75900,0,'VMP Connector',0,14300,4,'',0
+'2293',9901,161300,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111488 b/src/main/res-current/raw/current_gtfs_schedule_stop_111488
index 88c5b39c..b08497b7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111488
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111488
@@ -1,4 +1,7 @@
-'2046',101,74300,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61700,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7900,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93600,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83100,,'',0,21400,,'',0,48600,,'',0
+'2047',101,93600,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,164900,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60800,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
+'2656',101,164900,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
+'2430',1401,83100,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111489 b/src/main/res-current/raw/current_gtfs_schedule_stop_111489
index 87e34336..79145fd9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111489
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111489
@@ -1,15 +1,19 @@
-'2046',101,74100,,'',0,7200,0,'Downtown',0,3900,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61500,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,0,'Downtown',0,2100,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93300,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
-'2046',501,153200,0,'Anfield Ctr',0
-'2048',501,82500,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Anfield Ctr',0,10200,0,'Vanier',0
-'2046',601,84500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,14500,,'',0,5000,,'',0
-'2048',601,65000,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,5500,,'',0,14500,,'',0,5500,,'',0
-'2064',601,104000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1101,101400,,'',0,11500,,'',0,40000,,'',0,39800,,'',0,32200,,'',0
-'2048',1101,73700,,'',0,27400,,'',0,11500,,'',0,28100,,'',0,12000,,'',0,39800,,'',0,32500,,'',0
-'2046',1201,125800,,'',0,60000,,'',0
-'2048',1201,72900,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2054',1301,102800,,'',0,21400,,'',0,48600,,'',0
-'2048',9900,90100,0,'VMP Connector',0
-'2048',9901,161200,0,'VMP Connector',0
+'2047',101,93300,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
+'2089',101,164600,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,60600,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
+'2656',101,164600,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
+'2661',101,92400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
+'2293',501,82500,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
+'2660',501,153700,0,'Vanier',0
+'2047',601,104000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,65000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
+'2660',601,84500,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
+'2661',601,103000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1101,73700,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
+'2660',1101,101200,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
+'2293',1201,72900,,'',0,13000,,'',0,44200,,'',0,15800,,'',0,30000,,'',0,14200,,'',0
+'2660',1201,125800,,'',0,60000,,'',0
+'2430',1301,102800,,'',0,21400,,'',0,48600,,'',0
+'2293',9900,90100,0,'VMP Connector',0
+'2293',9901,161200,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111490 b/src/main/res-current/raw/current_gtfs_schedule_stop_111490
index 8f33ecb6..43161e30 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111490
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111490
@@ -1,2 +1,2 @@
-'2046',1001,91800,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,70300,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2293',1001,70300,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1001,91700,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111491 b/src/main/res-current/raw/current_gtfs_schedule_stop_111491
index 80982fd8..40224036 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111491
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111491
@@ -1,2 +1,2 @@
-'2046',701,85200,,'',0,24900,0,'Arden',0,21000,0,'Arden',0,24300,,'',0,15200,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,11900,,'',0,8200,,'',0,18700,0,'Arden',0,23200,0,'Arden',0
+'2293',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111492 b/src/main/res-current/raw/current_gtfs_schedule_stop_111492
index 3a19dade..fea4d5bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111492
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111492
@@ -1,3 +1,3 @@
-'2046',1200,114500,,'',0,60000,,'',0
-'2048',1200,61200,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
-'2048',9901,152600,0,'VMP Connector',0
+'2293',1200,61200,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,114300,,'',0,59900,,'',0
+'2293',9901,152600,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111499 b/src/main/res-current/raw/current_gtfs_schedule_stop_111499
index 88e260d8..102e7909 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111499
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111499
@@ -1,5 +1,6 @@
-'2046',401,85500,,'',0,14600,,'',0,10600,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,18000,,'',0,10000,,'',0,11100,,'',0
-'2048',401,85400,,'',0,14900,,'',0,10500,,'',0,11000,,'',0,10800,,'',0,9900,,'',0,18000,,'',0,10500,,'',0,13000,,'',0
-'2064',401,92600,,'',0,48100,,'',0,20500,,'',0
-'2046',1001,92000,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,70500,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2047',401,92600,,'',0,48100,,'',0,20500,,'',0
+'2293',401,90100,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,19000,,'',0,11600,,'',0,10400,,'',0
+'2660',401,85600,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10100,,'',0
+'2661',401,92200,,'',0,31500,,'',0,29200,,'',0
+'2293',1001,70500,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
+'2660',1001,91900,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111500 b/src/main/res-current/raw/current_gtfs_schedule_stop_111500
index dd173c75..f44eb119 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111500
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111500
@@ -1,3 +1,5 @@
-'2046',200,82000,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,14500,0,'Downtown',0,10500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63200,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95400,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95400,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232700,0,'Anfield Ctr',0
+'2293',200,63000,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,81900,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94400,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111501 b/src/main/res-current/raw/current_gtfs_schedule_stop_111501
index e686dce8..f1175818 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111501
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111501
@@ -1,3 +1,5 @@
-'2046',200,81900,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,14500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63100,0,'Anfield Ctr',0,9100,0,'Downtown',0,2400,0,'Comox Mall',0,9300,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95300,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95300,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232600,0,'Anfield Ctr',0
+'2293',200,62900,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,2900,0,'Comox Mall',0,9600,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,81800,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94300,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111502 b/src/main/res-current/raw/current_gtfs_schedule_stop_111502
index 1edcc25d..53e353c3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111502
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111502
@@ -1,3 +1,5 @@
-'2046',200,82100,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,11100,0,'Downtown',0,10400,0,'Downtown',0,14500,0,'Downtown',0,10500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,11100,0,'Downtown',0,17700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,63300,0,'Anfield Ctr',0,9100,0,'Downtown',0,2500,0,'Comox Mall',0,9200,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,10800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,18000,0,'Anfield Ctr',0,1700,0,'Downtown',0,6400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,95500,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2047',200,95500,0,'Downtown',0,36000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,232800,0,'Anfield Ctr',0
+'2293',200,63100,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,3000,0,'Comox Mall',0,9500,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,8000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0
+'2660',200,82000,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,14500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,12000,0,'Anfield Ctr',0,18000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,94500,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111503 b/src/main/res-current/raw/current_gtfs_schedule_stop_111503
index e998bb9e..bb192d77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111503
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111503
@@ -1,3 +1,5 @@
-'2046',201,91900,,'',0,33000,,'',0,10500,,'',0,10500,,'',0,38000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,62600,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,94400,,'',0,71500,,'',0,10000,,'',0
+'2047',201,94400,,'',0,71500,,'',0,10000,,'',0
+'2089',201,232100,,'',0
+'2293',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,93800,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111504 b/src/main/res-current/raw/current_gtfs_schedule_stop_111504
index f25d26cf..67ea2504 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111504
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111504
@@ -1,3 +1,5 @@
-'2046',201,92000,,'',0,33000,,'',0,10500,,'',0,14500,,'',0,34000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,62700,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,94500,,'',0,75500,,'',0,10000,,'',0
+'2047',201,94500,,'',0,75500,,'',0,10000,,'',0
+'2089',201,232200,,'',0
+'2293',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,93900,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111505 b/src/main/res-current/raw/current_gtfs_schedule_stop_111505
index f25d26cf..67ea2504 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111505
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111505
@@ -1,3 +1,5 @@
-'2046',201,92000,,'',0,33000,,'',0,10500,,'',0,14500,,'',0,34000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,62700,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,94500,,'',0,75500,,'',0,10000,,'',0
+'2047',201,94500,,'',0,75500,,'',0,10000,,'',0
+'2089',201,232200,,'',0
+'2293',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,93900,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111506 b/src/main/res-current/raw/current_gtfs_schedule_stop_111506
index 9304a6d8..535e22e4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111506
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111506
@@ -1,3 +1,4 @@
-'2046',2001,81400,,'',0,22000,,'',0,11100,,'',0,46500,,'',0,11300,,'',0,22700,,'',0
-'2048',2001,104100,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,18000,,'',0,8100,,'',0
-'2064',2001,130600,,'',0,20000,,'',0
+'2047',2001,130600,,'',0,20000,,'',0
+'2293',2001,103400,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
+'2660',2001,81300,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
+'2661',2001,131300,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_111507 b/src/main/res-current/raw/current_gtfs_schedule_stop_111507
index e998bb9e..bb192d77 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_111507
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_111507
@@ -1,3 +1,5 @@
-'2046',201,91900,,'',0,33000,,'',0,10500,,'',0,10500,,'',0,38000,,'',0,28800,,'',0,18200,,'',0
-'2048',201,62600,,'',0,8800,,'',0,2500,,'',0,9500,,'',0,9500,,'',0,41700,,'',0,29700,,'',0,9600,,'',0,19800,,'',0,19000,,'',0
-'2064',201,94400,,'',0,71500,,'',0,10000,,'',0
+'2047',201,94400,,'',0,71500,,'',0,10000,,'',0
+'2089',201,232100,,'',0
+'2293',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
+'2660',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
+'2661',201,93800,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_112064 b/src/main/res-current/raw/current_gtfs_schedule_stop_112064
index 9f1e4c9d..0d65bab0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_112064
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_112064
@@ -1,2 +1,2 @@
-'2046',1201,121900,,'',0,60000,,'',0
-'2048',1201,64700,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,64700,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,121900,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134002 b/src/main/res-current/raw/current_gtfs_schedule_stop_134002
index ad0e6536..73b98b95 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134002
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134002
@@ -1,4 +1,7 @@
-'2046',101,74600,,'',0,11100,,'',0,7700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,61900,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,93900,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2054',1401,83300,,'',0,21400,,'',0,48600,,'',0
+'2047',101,93900,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165200,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,61000,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165200,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,93000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2430',1401,83300,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134003 b/src/main/res-current/raw/current_gtfs_schedule_stop_134003
index ed67ce93..7ff9cc6f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134003
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134003
@@ -1,5 +1,6 @@
-'2046',701,110300,0,'Arden',0,21000,0,'Arden',0,39500,0,'Arden',0,33000,0,'Arden',0
-'2048',701,70300,0,'Arden',0,20500,0,'Arden',0,11400,0,'Arden',0,10000,0,'Arden',0,10000,0,'Arden',0,20100,0,'Arden',0,38800,0,'Arden',0,23200,0,'Arden',0
-'2046',801,85300,,'',0,15000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,64700,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,104800,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',701,70300,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
+'2660',701,110800,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
+'2047',801,104800,,'',0,20500,,'',0,25000,,'',0,20000,,'',0,15000,,'',0
+'2293',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134004 b/src/main/res-current/raw/current_gtfs_schedule_stop_134004
index 5a05cea0..557bf969 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134004
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134004
@@ -1,10 +1,14 @@
-'2046',101,74900,,'',0,15100,,'',0,3700,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2700,,'',0,6900,,'',0,8000,,'',0,2500,,'',0,3000,,'',0,14300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62200,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,94200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2046',701,90300,,'',0,70200,,'',0
-'2048',701,80200,,'',0,74900,,'',0,8200,,'',0
-'2046',801,90500,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,65900,,'',0,16300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,110000,,'',0,20500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
-'2048',1001,74600,,'',0
-'2054',1401,83500,,'',0,100,,'',0,21300,,'',0,100,,'',0,48500,,'',0,100,,'',0
+'2047',101,94200,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165500,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
+'2293',101,61300,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
+'2656',101,165500,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
+'2660',101,74600,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
+'2661',101,93300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2293',701,80200,,'',0,74900,,'',0,8200,,'',0
+'2660',701,90500,,'',0,65300,,'',0
+'2047',801,110000,,'',0,20500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,91100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
+'2293',1001,74600,,'',0
+'2430',1401,83500,,'',0,100,,'',0,21300,,'',0,100,,'',0,48500,,'',0,100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134005 b/src/main/res-current/raw/current_gtfs_schedule_stop_134005
index c45c20fc..a38715ab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134005
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134005
@@ -1,8 +1,12 @@
-'2046',100,83700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,12000,,'',0
-'2048',100,63200,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,5500,,'',0,1300,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2000,,'',0,2000,,'',0,8000,,'',0,2000,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,4000,,'',0,7000,,'',0,8000,,'',0,10000,,'',0,10000,,'',0
-'2064',100,92700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
-'2048',200,80100,0,'Comox Mall',0
-'2046',800,94700,,'',0,11000,,'',0,15600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,16900,,'',0,10500,,'',0,9500,,'',0,14000,,'',0
-'2048',800,62600,,'',0,11300,,'',0,11500,,'',0,9500,,'',0,10200,,'',0,10800,,'',0,15100,,'',0,10900,,'',0,8800,,'',0,10500,,'',0,9100,,'',0,12600,,'',0,12800,,'',0,19000,,'',0
-'2064',800,95200,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
-'2054',1400,91400,,'',0,21400,,'',0,48700,,'',0
+'2047',100,92700,,'',0,8500,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10500,,'',0
+'2089',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
+'2293',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
+'2656',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
+'2660',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
+'2661',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
+'2293',200,75800,0,'Comox Mall',0
+'2047',800,95200,,'',0,20100,,'',0,20500,,'',0,19500,,'',0,27900,,'',0
+'2293',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'2660',800,83300,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
+'2661',800,94000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
+'2430',1400,91400,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134006 b/src/main/res-current/raw/current_gtfs_schedule_stop_134006
index 0e1df28d..df4ec84d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134006
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134006
@@ -1,16 +1,24 @@
-'2046',101,75100,,'',0,15100,,'',0,3700,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2700,,'',0,6800,,'',0,8000,,'',0,2500,,'',0,7000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2048',101,62500,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,1700,,'',0,1000,,'',0,5500,,'',0,2100,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2200,,'',0,700,,'',0,800,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,7800,,'',0,4000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,7500,,'',0,10000,,'',0
-'2064',101,94400,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
-'2046',200,83100,0,'Downtown',0,10900,0,'Downtown',0,11100,0,'Downtown',0,15100,0,'Downtown',0,10400,0,'Downtown',0,10500,0,'Downtown',0,10500,0,'Downtown',0,11100,0,'Anfield Ctr',0,11300,0,'Downtown',0,11600,0,'Downtown',0,15100,0,'Downtown',0,13700,0,'Downtown',0,18300,0,'Downtown',0
-'2048',200,64300,0,'Anfield Ctr',0,9100,0,'Downtown',0,11700,0,'Downtown',0,9500,0,'Downtown',0,11200,0,'Anfield Ctr',0,9800,0,'Downtown',0,14800,0,'Downtown',0,9900,0,'Downtown',0,10000,0,'Downtown',0,14000,0,'Anfield Ctr',0,5700,0,'Downtown',0,2400,0,'Anfield Ctr',0,3200,0,'Anfield Ctr',0,19800,0,'Downtown',0,19000,0,'Downtown',0
-'2064',200,100500,0,'Downtown',0,32000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
-'2046',801,90700,,'',0,11000,,'',0,11000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10200,,'',0,16800,,'',0,10500,,'',0,19000,,'',0
-'2048',801,70100,,'',0,12300,,'',0,9500,,'',0,10000,,'',0,10300,,'',0,11400,,'',0,10000,,'',0,9300,,'',0,12300,,'',0,8100,,'',0,19300,,'',0,10000,,'',0,19100,,'',0
-'2064',801,110200,,'',0,20500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
-'2046',1001,92300,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2048',1001,71000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2064',1001,104100,,'',0,68000,,'',0
-'2054',1401,83800,,'',0,21400,,'',0,48600,,'',0
-'2046',2001,80000,,'',0,22000,,'',0,11100,,'',0,42500,,'',0,15300,,'',0,22700,,'',0
-'2048',2001,102700,,'',0,9800,,'',0,10800,,'',0,19900,,'',0,17700,,'',0,300,,'',0,4100,,'',0
-'2064',2001,125200,,'',0,20000,,'',0
+'2047',101,94400,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10300,,'',0,7900,,'',0,9400,,'',0
+'2089',101,165800,,'',0,28100,,'',0,11800,,'',0,14500,,'',0,10900,,'',0
+'2293',101,61600,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,11500,,'',0
+'2656',101,165800,,'',0,28100,,'',0,11800,,'',0,14500,,'',0
+'2660',101,74800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,14500,,'',0,10900,,'',0
+'2661',101,93500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
+'2047',200,100500,0,'Downtown',0,32000,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19200,0,'Downtown',0,10000,0,'Downtown',0
+'2089',200,233800,0,'Anfield Ctr',0
+'2293',200,64100,0,'Anfield Ctr',0,8500,0,'Anfield Ctr',0,12500,0,'Anfield Ctr',0,9500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,14900,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,4000,0,'Anfield Ctr',0,9000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,15500,0,'Anfield Ctr',0,14000,0,'Anfield Ctr',0
+'2660',200,83000,0,'Anfield Ctr',0,11000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,15000,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,10500,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,10000,0,'Anfield Ctr',0,11500,0,'Anfield Ctr',0,16000,0,'Anfield Ctr',0,14000,0,'Anfield Ctr',0,19300,0,'Anfield Ctr',0
+'2661',200,95500,0,'Anfield Ctr',0,37500,0,'Anfield Ctr',0,20000,0,'Anfield Ctr',0,19700,0,'Anfield Ctr',0,19400,0,'Anfield Ctr',0
+'2047',801,110200,,'',0,20500,,'',0,21000,,'',0,20000,,'',0,19000,,'',0
+'2293',801,65900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,14900,,'',0,12200,,'',0,11500,,'',0,18000,,'',0
+'2660',801,91300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
+'2661',801,105400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
+'2047',1001,104100,,'',0,68000,,'',0
+'2293',1001,71000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
+'2660',1001,92400,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
+'2661',1001,104100,,'',0,68200,,'',0
+'2430',1401,83800,,'',0,21400,,'',0,48600,,'',0
+'2047',2001,125200,,'',0,20000,,'',0
+'2293',2001,102000,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,17700,,'',0,300,,'',0,9000,,'',0
+'2660',2001,75900,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
+'2661',2001,125900,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134007 b/src/main/res-current/raw/current_gtfs_schedule_stop_134007
index c1f5de12..ebf89d56 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134007
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134007
@@ -1,3 +1,3 @@
-'2046',1000,102500,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2048',1000,80000,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2064',1000,114500,,'',0
+'2047',1000,114500,,'',0
+'2293',1000,80000,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
+'2660',1000,102400,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134008 b/src/main/res-current/raw/current_gtfs_schedule_stop_134008
index b7daa7fa..8749f0f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134008
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134008
@@ -1,2 +1,2 @@
-'2048',301,82800,0,'Isfeld S',0
-'2048',9900,81600,0,'VMP Connector',0
+'2293',301,82900,0,'Isfeld S',0
+'2293',9900,81600,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134009 b/src/main/res-current/raw/current_gtfs_schedule_stop_134009
index c74ee59f..37d9cce5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134009
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134009
@@ -1 +1 @@
-'2048',9901,155200,0,'VMP Connector',0
+'2293',9901,155200,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134010 b/src/main/res-current/raw/current_gtfs_schedule_stop_134010
index beb98718..f5e45c29 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134010
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134010
@@ -1,10 +1,14 @@
-'2046',101,73400,,'',0,7100,0,'Downtown',0,4000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,6900,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60900,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1500,0,'Downtown',0,6100,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3800,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92600,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
-'2046',601,83100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63600,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
-'2046',1101,100600,,'',0,11500,,'',0,40000,,'',0,40000,,'',0,32200,,'',0
-'2048',1101,73100,,'',0,27300,,'',0,11500,,'',0,24000,,'',0,16000,,'',0,40000,,'',0,32500,,'',0
-'2048',1201,72100,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
-'2048',9901,160400,0,'VMP Connector',0
+'2047',101,92600,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9400,,'',0
+'2089',101,163700,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55900,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15600,,'',0
+'2656',101,163700,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
+'2660',101,73000,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
+'2047',601,102600,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,83100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
+'2661',601,101600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2293',1101,73100,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
+'2660',1101,100400,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
+'2293',1201,72100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2293',9901,160400,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134011 b/src/main/res-current/raw/current_gtfs_schedule_stop_134011
index 406379ba..09bfb416 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134011
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134011
@@ -1 +1 @@
-'2048',9900,80800,0,'VMP Connector',0
+'2293',9900,80800,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134012 b/src/main/res-current/raw/current_gtfs_schedule_stop_134012
index 3e55b551..f3ce57fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134012
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134012
@@ -1,3 +1,3 @@
-'2046',1100,93800,,'',0,11600,,'',0,40000,,'',0,39800,,'',0,36400,,'',0
-'2048',1100,70700,,'',0,23000,,'',0,11500,,'',0,28000,,'',0,12000,,'',0,40000,,'',0,36500,,'',0
-'2054',1301,95000,,'',0,25400,,'',0,44600,,'',0
+'2293',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
+'2660',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
+'2430',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134013 b/src/main/res-current/raw/current_gtfs_schedule_stop_134013
index 6025cfb4..7eb06b21 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134013
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134013
@@ -1,3 +1,4 @@
-'2046',601,82700,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0
-'2048',601,63200,,'',0,9200,,'',0,10500,,'',0,10300,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9500,,'',0,10500,,'',0,9500,,'',0
-'2064',601,102200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2047',601,102200,,'',0,20500,,'',0,20500,,'',0,20000,,'',0
+'2293',601,63200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
+'2660',601,82700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
+'2661',601,101200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134014 b/src/main/res-current/raw/current_gtfs_schedule_stop_134014
index 76b48a4d..45229ae5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134014
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134014
@@ -1,5 +1,8 @@
-'2046',101,73000,,'',0,7100,0,'Downtown',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,4000,,'',0,6500,,'',0,3000,,'',0,7000,0,'Downtown',0,3500,,'',0,10000,,'',0,10000,,'',0
-'2048',101,60500,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,1700,,'',0,900,,'',0,1400,0,'Downtown',0,100,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6200,,'',0,700,,'',0,800,,'',0,1800,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,4000,,'',0,8000,,'',0,3000,,'',0,7900,,'',0,7000,,'',0,3500,,'',0,10000,,'',0
-'2064',101,92100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
-'2048',301,83500,0,'Isfeld S',0
-'2048',9900,82100,0,'VMP Connector',0
+'2047',101,92100,,'',0,9000,,'',0,11100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,8000,,'',0,9500,,'',0
+'2089',101,163200,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
+'2293',101,55500,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
+'2656',101,163200,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
+'2660',101,72600,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
+'2661',101,91100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
+'2293',301,83500,0,'Isfeld S',0
+'2293',9900,82100,0,'VMP Connector',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134016 b/src/main/res-current/raw/current_gtfs_schedule_stop_134016
index 8e194817..4e2873b0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134016
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134016
@@ -1,2 +1,2 @@
-'2046',1201,124700,,'',0,60000,,'',0
-'2048',1201,71500,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,71500,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,124700,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134017 b/src/main/res-current/raw/current_gtfs_schedule_stop_134017
index 8ddfbb4d..42989dd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134017
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134017
@@ -1,3 +1,3 @@
-'2046',1200,115500,,'',0,60000,,'',0
-'2048',1200,62200,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
-'2054',1301,100400,,'',0,21400,,'',0,48600,,'',0
+'2293',1200,62200,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,115300,,'',0,59900,,'',0
+'2430',1301,100400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134018 b/src/main/res-current/raw/current_gtfs_schedule_stop_134018
index 36eaa3a1..e3ba54ac 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134018
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134018
@@ -1,2 +1,2 @@
-'2046',1201,123900,,'',0,60000,,'',0
-'2048',1201,70700,,'',0,13000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1201,70700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1201,123900,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134019 b/src/main/res-current/raw/current_gtfs_schedule_stop_134019
index 8d8161ae..f83b0456 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134019
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134019
@@ -1,2 +1,2 @@
-'2046',1200,120200,,'',0,60000,,'',0
-'2048',1200,62900,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',1200,62900,,'',0,13000,,'',0,44100,,'',0,15300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,120000,,'',0,55900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134020 b/src/main/res-current/raw/current_gtfs_schedule_stop_134020
index 4ef298db..520de5ff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134020
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134020
@@ -1,2 +1,2 @@
-'2046',1200,120400,,'',0,60000,,'',0
-'2048',1200,63100,,'',0,17000,,'',0,40000,,'',0,15400,,'',0,34600,,'',0,10000,,'',0
+'2293',1200,63100,,'',0,17000,,'',0,40100,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
+'2660',1200,120200,,'',0,59900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134021 b/src/main/res-current/raw/current_gtfs_schedule_stop_134021
index 94858ac9..e6285920 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134021
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134021
@@ -1,4 +1,4 @@
-'2046',1200,121300,4,'',0,60000,4,'',0
-'2046',1201,121700,,'',0,60000,,'',0
-'2048',1200,64000,4,'',0,17000,4,'',0,40000,4,'',0,19400,4,'',0,30600,4,'',0,10000,4,'',0
-'2048',1201,64500,,'',0,17000,,'',0,40000,,'',0,20000,,'',0,30000,,'',0,10000,,'',0
+'2293',1200,64000,4,'',0,17000,4,'',0,40100,4,'',0,19300,4,'',0,30600,4,'',0,10000,4,'',0
+'2293',1201,64500,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
+'2660',1200,121100,4,'',0,59900,4,'',0
+'2660',1201,121700,,'',0,60000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_134023 b/src/main/res-current/raw/current_gtfs_schedule_stop_134023
index c80b040a..899d45d4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_134023
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_134023
@@ -1,2 +1,2 @@
-'2046',1200,114700,,'',0,60000,,'',0
-'2048',1200,61400,,'',0,13000,,'',0,40000,,'',0,19400,,'',0,30600,,'',0,10000,,'',0
+'2293',1200,61400,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
+'2660',1200,114500,,'',0,59900,,'',0
diff --git a/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index 6f6a6a03..16bb0958 100644
--- a/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
     <string name="current_gtfs_rts_area_max_lat">49.87338</string>
     <string name="current_gtfs_rts_area_min_lng">-125.14771</string>
     <string name="current_gtfs_rts_area_max_lng">-124.79517</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1711295280</integer><!-- 2024/03/24 08:48:00 PDT -->
-    <integer name="current_gtfs_rts_last_departure_in_sec">1711939860</integer><!-- 2024/03/31 19:51:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1711900080</integer><!-- 2024/03/31 08:48:00 PDT -->
+    <integer name="current_gtfs_rts_last_departure_in_sec">1719802260</integer><!-- 2024/06/30 19:51:00 PDT -->
 </resources>
diff --git a/src/main/res-next/raw/next_gtfs_rts_routes b/src/main/res-next/raw/next_gtfs_rts_routes
deleted file mode 100644
index 27f5b3ac..00000000
--- a/src/main/res-next/raw/next_gtfs_rts_routes
+++ /dev/null
@@ -1,16 +0,0 @@
-1,'1','Comox Mall / Anfield Ctr Via NIC','004B8D',49,3
-2,'2','Cumberland / Anfield Ctr','8CC63F',50,3
-3,'3','Comox Local','F37421',51,3
-4,'4','Driftwood Mall / Comox Mall Via Comox Rd','00AEEF',52,3
-5,'5','Vanier','FCAF17',53,3
-6,'6','Uplands','00AA47',54,3
-7,'7','Arden','ED1D8F',55,3
-8,'8','Downtown / Anfield Ctr','8177B7',56,3
-10,'10','Fanny Bay / Downtown Courtenay','49176B',1567,3
-11,'11','Airport Via Powell R Ferry / Downtown','B2BB1E',1568,3
-12,'12','Oyster River / Downtown Courtenay','4F6F19',1569,3
-13,'13','Merville-Seal Bay Shuttle','77AF99',1570,3
-14,'14','Union Bay Shuttle','E270AB',1571,3
-15,'15','Comox Mall Via Back Rd / Aquatic Ctr Via Back Rd','5D87A1',1572,3
-20,'20','Cumberland Via Royston','0073AE',1598,3
-99,'99','VMP Connector','F49A5D',1824,3
diff --git a/src/main/res-next/raw/next_gtfs_rts_stops b/src/main/res-next/raw/next_gtfs_rts_stops
deleted file mode 100644
index e438f5d0..00000000
--- a/src/main/res-next/raw/next_gtfs_rts_stops
+++ /dev/null
@@ -1,261 +0,0 @@
-103860,'103860','Clarkson @ Eyre',49.86431,-125.11673,0,1448732286
-103861,'103861','Hwy 19A @ White',49.83352,-125.12984,0,1448732287
-103862,'103862','Hwy 19A @ Hayward',49.64407,-124.93838,0,1448732288
-103863,'103863','Hwy 19A @ McLeod',49.5811,-124.88456,0,1448732289
-103864,'103864','Hwy 19A @ Denman',49.52559,-124.85003,0,1448732290
-103865,'103865','Hwy 19A @ Herondale',49.6296,-124.91872,0,1448732291
-103867,'103867','Hayward @ Hwy 19A',49.64368,-124.93638,0,1448732293
-103868,'103868','Marine @ Greig',49.64513,-124.93952,0,1448732294
-103869,'103869','Hwy 19A @ Hilton',49.65133,-124.9566,0,1448732295
-103870,'103870','Comox @ Scott',49.67914,-124.96564,0,1448732317
-103871,'103871','2700 Blk Comox Rd',49.68076,-124.97208,0,1448732318
-103872,'103872','2700 Blk Comox Rd',49.68086,-124.97199,0,1448732319
-103873,'103873','Ryan @ Greenwood',49.71495,-124.92814,0,1448732320
-103874,'103874','Ryan @ Little River',49.7151,-124.9099,0,1448732321
-110227,'110227','Vets'' Memorial @ Caledon',49.71581,-124.98776,0,1449560551
-110247,'110247','Vets'' Memorial @ Wentworth',49.71559,-124.98866,0,1449560613
-110248,'110248','Lerwick @ Waters',49.71415,-124.97026,0,1449560614
-110270,'110270','Comox Vly Senior''s Vlg',49.70285,-124.99403,0,1449560699
-110303,'110303','Lerwick @ Waters',49.71317,-124.96927,0,1449561446
-110305,'110305','Ryan @ Back Rd',49.70154,-124.98271,0,1449561448
-110324,'110324','Hwy 19A @ Buckley Bay',49.52396,-124.84848,0,1449561509
-110336,'110336','Hwy 19A @ Garvin',49.56211,-124.87356,0,1449561542
-110337,'110337','Hwy 19A @ Spindrift',49.62213,-124.91326,0,1449561543
-110338,'110338','Hwy 19A @ Gartley',49.63866,-124.92866,0,1449561544
-110377,'110377','Comox @ Scott',49.6792,-124.96534,0,1449561667
-110379,'110379','Anderton Rd @ Greenwood Cres',49.71734,-124.93356,0,1449561669
-110397,'110397','Bates @ Seal Bay Pk',49.76095,-124.97175,0,1449561729
-110398,'110398','Tammy @ MacAuley',49.86072,-125.14771,0,1449561730
-110413,'110413','Miracle Beach @ Hwy 19A',49.85184,-125.13165,0,1449562438
-110420,'110420','Bates @ Coleman',49.77848,-124.98916,0,1449562466
-110448,'110448','Merville @ Hwy 19A',49.7838,-125.05829,0,1449562536
-110493,'110493','Hwy 19A @ Spindrift',49.62073,-124.9134,0,1449562686
-110523,'110523','Hwy 19A @ Union Bay',49.58373,-124.88616,0,1449563430
-110524,'110524','Hwy 19A @ Royston',49.64578,-124.94589,0,1449563431
-110525,'110525','Anderton Rd @ Galleon Way',49.7049,-124.93402,0,1449563432
-110526,'110526','Comox Vly Sports Ctr',49.71074,-125.00088,0,1449563433
-110528,'110528','Cliffe @ 8th St',49.68993,-124.99633,0,1449563435
-110529,'110529','Cliffe @ 11th St',49.68814,-124.99486,0,1449563436
-110530,'110530','Downtown Courtenay',49.69187,-124.99855,0,1449563458
-110531,'110531','Comox Mall',49.67367,-124.92517,0,1449563459
-110532,'110532','Anderton @ Robb',49.68129,-124.93543,0,1449563460
-110533,'110533','Rodello @ Fairbairn',49.67631,-124.94019,0,1449563461
-110534,'110534','Beaufort @ Church',49.67363,-124.92898,0,1449563462
-110535,'110535','Beaufort @ Wilcox',49.67263,-124.92709,0,1449563463
-110536,'110536','Beaufort @ Nordin',49.67215,-124.92564,0,1449563464
-110537,'110537','Balmoral @ Anderton Pk',49.67432,-124.92246,0,1449563465
-110538,'110538','Balmoral @ Pritchard',49.67403,-124.91752,0,1449563466
-110539,'110539','Fitzgerald @ 19th St',49.6814,-124.99007,0,1449563467
-110542,'110542','Hwy 19A @ Krueger',49.79473,-125.07438,0,1449563491
-110543,'110543','Hwy 19A @ Black Crk',49.81413,-125.11843,0,1449563492
-110544,'110544','Hwy 19A @ Black Crk',49.81442,-125.11839,0,1449563493
-110545,'110545','Comox @ Queneesh',49.67812,-124.95792,0,1449563494
-110546,'110546','Hwy 19A @ Virginia',49.72006,-124.99318,0,1449563495
-110547,'110547','Hwy 19A @ Virginia',49.72195,-124.99353,0,1449563496
-110550,'110550','Woods @ 2nd St',49.68653,-125.01419,0,1449563520
-110551,'110551','Hwy 19A @ Ships Pt',49.49071,-124.81291,0,1449563521
-110552,'110552','Torrence @ Casey',49.67907,-124.90871,0,1449563522
-110553,'110553','Clarkson @ Maple',49.86058,-125.11596,0,1449563523
-110554,'110554','Clarkson @ Beach',49.85118,-125.10282,0,1449563524
-110555,'110555','Back Rd @ Tatpoos',49.68068,-124.95294,0,1449563525
-110556,'110556','Back Rd @ Tatpoos',49.68054,-124.95306,0,1449563526
-110557,'110557','Back Rd @ Sahtloot',49.6823,-124.95576,0,1449563527
-110558,'110558','Back Rd @ Sahtloot',49.68212,-124.95587,0,1449563528
-110559,'110559','Back Rd @ McDonald',49.68468,-124.95786,0,1449563529
-110560,'110560','Back Rd @ McDonald',49.6854,-124.95837,0,1449563551
-110561,'110561','Back Rd @ 10th St E',49.69959,-124.9762,0,1449563552
-110565,'110565','Cowichan @ 5th St E',49.70651,-124.96824,0,1449563556
-110566,'110566','Menzies @ 2nd St',49.68884,-125.00957,0,1449563557
-111270,'111270','Downtown Courtenay',49.69201,-124.9984,0,1449590490
-111271,'111271','Fitzgerald @ 8th St',49.68772,-124.99974,0,1449590491
-111272,'111272','Fitzgerald @ 18th St',49.68166,-124.99065,0,1449590492
-111273,'111273','Fitzgerald @ 21st St',49.67979,-124.98748,0,1449590493
-111274,'111274','Fitzgerald @ 23rd St',49.67716,-124.98596,0,1449590494
-111275,'111275','Anfield Ctr',49.6683,-124.97996,0,1449590495
-111276,'111276','Kilpatrick @ 30th St',49.67016,-124.98099,0,1449590496
-111277,'111277','Kilpatrick @ 29th St',49.67209,-124.98342,0,1449590497
-111278,'111278','Driftwood Mall',49.67511,-124.98472,0,1449590498
-111280,'111280','Fitzgerald @ 21st St',49.67921,-124.98679,0,1449590521
-111281,'111281','Fitzgerald @ 16th St',49.6835,-124.99361,0,1449590522
-111282,'111282','Fitzgerald @ 13th St',49.68523,-124.9963,0,1449590523
-111284,'111284','Fitzgerald @ 8th St',49.68771,-124.99955,0,1449590525
-111286,'111286','Fitzgerald @ 5th St',49.69026,-125.00179,0,1449590527
-111288,'111288','Dunsmuir @ Carlisle',49.62018,-125.01741,0,1449590529
-111289,'111289','Dunsmuir @ 6th St',49.61961,-125.02297,0,1449590530
-111290,'111290','Dunsmuir @ 4th St',49.61922,-125.02699,0,1449590552
-111291,'111291','Dunsmuir @ 1st St',49.61881,-125.03163,0,1449590553
-111292,'111292','Egremont @ Dunsmuir',49.61877,-125.03455,0,1449590554
-111293,'111293','Egremont @ Ulverston',49.62229,-125.03624,0,1449590555
-111294,'111294','Windermere @ 1st St',49.62128,-125.03133,0,1449590556
-111295,'111295','Cumberland @ Stockand',49.62451,-125.0248,0,1449590557
-111296,'111296','Old Isl Hwy @ Puntledge',49.6952,-124.99225,0,1449590558
-111297,'111297','Ryan @ Puntledge',49.69753,-124.98982,0,1449590559
-111298,'111298','1000 Blk Ryan Rd',49.69981,-124.98539,0,1449590560
-111299,'111299','NIC Campus',49.70988,-124.97097,0,1449590561
-111300,'111300','Lerwick @ Malahat',49.70583,-124.95992,0,1449591234
-111301,'111301','Lerwick @ Vly Vw',49.69902,-124.95641,0,1449591235
-111302,'111302','Lerwick @ Inverclyde',49.69437,-124.953,0,1449591236
-111303,'111303','Guthrie @ Aspen Grv Ctr',49.68911,-124.9463,0,1449591237
-111304,'111304','Guthrie @ Stadacona',49.68831,-124.93786,0,1449591238
-111305,'111305','Anderton Rd @ Guthrie Rd',49.68738,-124.93503,0,1449591239
-111306,'111306','Anderton Rd @ Bolt Ave',49.68401,-124.93521,0,1449591240
-111322,'111322','Comox @ Pritchard',49.67205,-124.92103,0,1449591298
-111323,'111323','Comox Mall',49.67301,-124.92481,0,1449591299
-111324,'111324','Comox @ Ellis',49.67468,-124.93024,0,1449591300
-111325,'111325','Anderton Rd @ Buena Vista Ave',49.67658,-124.93506,0,1449591301
-111326,'111326','Anderton @ Robb',49.68013,-124.93528,0,1449591302
-111327,'111327','Robb @ Thistle',49.68079,-124.93809,0,1449591303
-111328,'111328','Robb @ Rodello',49.68088,-124.94156,0,1449591304
-111329,'111329','Aitken St @ McKenzie Ave',49.67981,-124.94395,0,1449591305
-111330,'111330','Downey @ Aitken',49.67807,-124.94326,0,1449591327
-111331,'111331','Downey @ Rodello',49.67802,-124.94059,0,1449591328
-111332,'111332','St Joseph''s Hosp',49.67554,-124.94205,0,1449591329
-111333,'111333','Comox @ Queneesh',49.67823,-124.95804,0,1449591330
-111336,'111336','Cliffe @ 19th St',49.68183,-124.98654,0,1449591333
-111337,'111337','Cliffe @ 19th St',49.68204,-124.98671,0,1449591334
-111340,'111340','St Joseph''s Hosp',49.67547,-124.94173,0,1449591358
-111347,'111347','Anderton @ McKenzie',49.67908,-124.93563,0,1449591365
-111348,'111348','Anderton Rd @ Buena Vista Ave',49.6764,-124.93529,0,1449591366
-111349,'111349','Comox @ Ellis',49.67434,-124.9296,0,1449591367
-111352,'111352','Balmoral @ Donovan',49.67398,-124.91237,0,1449591391
-111353,'111353','Torrence @ Albatross',49.67556,-124.90882,0,1449591392
-111355,'111355','Torrence @ Noel',49.68233,-124.90857,0,1449591394
-111356,'111356','Torrence @ Hillside',49.68361,-124.90975,0,1449591395
-111357,'111357','Torrence @ Ridgemount',49.68598,-124.90972,0,1449591396
-111358,'111358','Guthrie @ Skeena',49.68795,-124.91396,0,1449591397
-111359,'111359','Pritchard @ Guthrie',49.68764,-124.91707,0,1449591398
-111360,'111360','Pritchard @ Skeena',49.68512,-124.91701,0,1449591420
-111361,'111361','Pritchard @ Noel',49.68241,-124.91707,0,1449591421
-111362,'111362','Pritchard @ Dogwood',49.67976,-124.9171,0,1449591422
-111363,'111363','Robb @ Stewart',49.67871,-124.91913,0,1449591423
-111364,'111364','1700 Blk Robb Ave',49.67948,-124.92241,0,1449591424
-111365,'111365','Robb @ Megin',49.68037,-124.92546,0,1449591425
-111366,'111366','Church @ Hemlock',49.68194,-124.92696,0,1449591426
-111367,'111367','Noel @ Holly',49.68249,-124.93314,0,1449591427
-111368,'111368','Anderton Rd @ Bolt Ave',49.68396,-124.93501,0,1449591428
-111369,'111369','Anderton Rd @ Guthrie Rd',49.68763,-124.93486,0,1449591429
-111370,'111370','Guthrie @ Stadacona',49.68848,-124.93785,0,1449591451
-111371,'111371','Guthrie @ Aspen',49.68856,-124.94253,0,1449591452
-111372,'111372','Lerwick @ Inverclyde',49.69512,-124.95373,0,1449591453
-111373,'111373','2100 Blk Lerwick Rd',49.69607,-124.95512,0,1449591454
-111374,'111374','2100 Blk Lerwick Rd',49.69639,-124.95538,0,1449591455
-111375,'111375','Lerwick @ Vly Vw',49.69966,-124.95594,0,1449591456
-111377,'111377','Lerwick @ Ryan',49.70975,-124.96468,0,1449591458
-111378,'111378','800 Blk Ryan Rd',49.6996,-124.98631,0,1449591459
-111379,'111379','Ryan @ Puntledge',49.69742,-124.9903,0,1449591460
-111380,'111380','Old Isl Hwy @ Puntledge',49.69506,-124.99251,0,1449591482
-111381,'111381','5th St @ Simms Pk',49.69285,-124.99395,0,1449591483
-111382,'111382','Cliffe @ 11th St',49.6875,-124.99422,0,1449591484
-111383,'111383','Cliffe @ 14th St',49.68615,-124.99259,0,1449591485
-111384,'111384','Back Rd @ Tunner',49.70064,-124.98165,0,1449591486
-111385,'111385','Sitka @ 10th St E',49.70091,-124.97149,0,1449591487
-111386,'111386','Sitka @ Malahat',49.7,-124.96936,0,1449591488
-111387,'111387','Thorpe @ Malahat',49.70004,-124.96725,0,1449591489
-111388,'111388','Thorpe @ Griffin',49.69779,-124.96361,0,1449591490
-111389,'111389','Vly Vw @ Partridge',49.69752,-124.96104,0,1449591491
-111390,'111390','Mission @ Walbran',49.71346,-124.97503,0,1449591513
-111391,'111391','Mission @ Shetland',49.71194,-124.97796,0,1449591514
-111392,'111392','Muir @ Anna',49.71291,-124.97994,0,1449591515
-111393,'111393','Muir @ Cruickshank',49.71187,-124.98355,0,1449591516
-111394,'111394','McLauchlin @ MacIntyre',49.7106,-124.98476,0,1449591517
-111395,'111395','McLauchlin @ Panorama',49.70599,-124.98066,0,1449591518
-111396,'111396','Centennial @ Back Rd',49.70217,-124.98304,0,1449591519
-111397,'111397','5th St @ Leighton Ave',49.68824,-125.00665,0,1449591520
-111398,'111398','Menzies @ 3rd St',49.68883,-125.0093,0,1449591521
-111399,'111399','1st St @ Urquhart Ave',49.68798,-125.01434,0,1449591522
-111400,'111400','1st St @ Embleton Cres',49.68628,-125.0175,0,1449592195
-111401,'111401','1st St @ Mitchell Pl',49.68412,-125.02149,0,1449592196
-111402,'111402','Embleton @ Rod And Gun',49.68339,-125.0181,0,1449592197
-111404,'111404','Woods @ 2nd St',49.68625,-125.01395,0,1449592199
-111405,'111405','Woods @ Martin',49.68421,-125.01108,0,1449592200
-111406,'111406','5th St @ Willemar Ave',49.68263,-125.01011,0,1449592201
-111407,'111407','2100 Blk 20th St',49.67111,-125.00571,0,1449592202
-111408,'111408','Willemar @ 20th St',49.67393,-125.00013,0,1449592203
-111409,'111409','21st St @ Urquhart Ave',49.67378,-124.9977,0,1449592204
-111410,'111410','21st St @ Stewart Ave',49.67503,-124.99543,0,1449592226
-111411,'111411','2300 Blk Piercy Ave',49.67415,-124.99304,0,1449592227
-111412,'111412','Piercy @ 26th St',49.67356,-124.99204,0,1449592228
-111413,'111413','26th St @ Piercy Ave',49.67281,-124.99047,0,1449592229
-111414,'111414','26th St @ Kilpatrick Ave',49.67412,-124.98809,0,1449592230
-111415,'111415','Menzies @ 8th St',49.68605,-125.00618,0,1449592231
-111416,'111416','Pidcock @ Bryan',49.68545,-125.00718,0,1449592232
-111417,'111417','10th St @ Willemar Ave',49.68126,-125.00911,0,1449592233
-111418,'111418','10th St @ Willemar Ave',49.68122,-125.00887,0,1449592234
-111419,'111419','10th St @ Stewart Ave',49.68263,-125.00641,0,1449592235
-111420,'111420','Cumberland @ Piercy',49.68182,-125.00352,0,1449592257
-111421,'111421','Cumberland @ 16th St',49.67832,-125.00414,0,1449592258
-111422,'111422','1800 Blk Willemar Ave',49.6757,-125.00239,0,1449592259
-111423,'111423','26th St @ Kilpatrick Ave',49.67406,-124.98848,0,1449592260
-111424,'111424','Piercy @ 21st St',49.67624,-124.99548,0,1449592261
-111425,'111425','Piercy @ 18th St',49.67834,-124.99828,0,1449592262
-111426,'111426','17th St @ Willemar Ave',49.677,-125.0033,0,1449592263
-111427,'111427','Cumberland @ 16th St',49.67833,-125.00404,0,1449592264
-111428,'111428','Cumberland @ Piercy',49.6816,-125.00353,0,1449592265
-111429,'111429','Piercy @ Cumberland',49.68261,-125.0039,0,1449592266
-111430,'111430','10th St @ Stewart Ave',49.68285,-125.00613,0,1449592288
-111431,'111431','5th St @ Urquhart Ave',49.68281,-125.00979,0,1449592289
-111432,'111432','5th St @ Kilpatrick Ave',49.68849,-125.00574,0,1449592290
-111435,'111435','Hwy 19A @ Russell',49.5867,-124.88728,0,1449592293
-111437,'111437','Hwy 19A @ Ships Pt',49.49017,-124.81184,0,1449592295
-111438,'111438','Hwy 19A @ Fanny Bay',49.47266,-124.79517,0,1449592296
-111442,'111442','Kingfisher Resort',49.63205,-124.92034,0,1449592321
-111448,'111448','Ryan @ Crown Isle Plz',49.71161,-124.96322,0,1449592327
-111449,'111449','BC Ferries - Little River',49.74018,-124.92512,0,1449592328
-111450,'111450','Military @ Ryan',49.71393,-124.90911,0,1449592350
-111451,'111451','Military @ Rose',49.7086,-124.90912,0,1449592351
-111452,'111452','Comox Vly Airport',49.70605,-124.90676,0,1449592352
-111455,'111455','10th St E @ G Urquhart Dr',49.70018,-124.9737,0,1449592355
-111456,'111456','Back Rd @ 6th St E',49.70026,-124.97875,0,1449592356
-111457,'111457','Arden @ 1st St',49.68163,-125.02488,0,1449592357
-111459,'111459','Cliffe @ Mansfield',49.67854,-124.98389,0,1449592359
-111461,'111461','2000 Blk Lk Trl Rd',49.67876,-125.01376,0,1449592382
-111463,'111463','McLauchlin @ Dingwall',49.70808,-124.98168,0,1449592384
-111464,'111464','2200 Blk Embleton Cres',49.68173,-125.02131,0,1449592385
-111465,'111465','Embleton @ Osprey',49.68497,-125.01683,0,1449592386
-111467,'111467','20th St @ Cousins Ave',49.67286,-125.00254,0,1449592388
-111473,'111473','Back Rd @ 10th St E',49.69948,-124.97622,0,1449592415
-111474,'111474','Fitzgerald @ 13th St',49.68514,-124.99642,0,1449592416
-111475,'111475','Ryan @ Crown Isle',49.7123,-124.96246,0,1449592417
-111476,'111476','NIC / Aquatic Ctr',49.71117,-124.96823,0,1449592418
-111477,'111477','Lerwick @ Ryan',49.70945,-124.96452,0,1449592419
-111478,'111478','Lerwick @ Malahat',49.70586,-124.95968,0,1449592420
-111479,'111479','Mark R Isfeld S',49.70368,-124.95919,0,1449592421
-111480,'111480','Cowichan @ 4th St E',49.70731,-124.96939,0,1449592443
-111481,'111481','Vly Vw @ Lerwick',49.69949,-124.95743,0,1449592444
-111483,'111483','Hwy 19A @ Royston',49.64587,-124.94602,0,1449592446
-111486,'111486','Downtown Courtenay',49.6923,-124.99815,0,1449592449
-111488,'111488','Fitzgerald @ 5th St',49.68958,-125.00138,0,1449592451
-111489,'111489','Anderton Ave @ 3rd St',49.69289,-124.99661,0,1449592452
-111490,'111490','Cliffe @ 17th St',49.68489,-124.99168,0,1449592474
-111491,'111491','1st St @ Embleton Cres',49.6862,-125.01733,0,1449592475
-111492,'111492','Vanier @ Sports Ctr',49.71159,-125.00109,0,1449592476
-111499,'111499','Cliffe @ Mansfield',49.67871,-124.98429,0,1449592483
-111500,'111500','1st St @ Rydal Ave',49.62413,-125.03237,0,1449593156
-111501,'111501','Egremont @ Rydal',49.62411,-125.03667,0,1449593157
-111502,'111502','3rd St @ Kendal Ave',49.62293,-125.02762,0,1449593158
-111503,'111503','4th St @ Ulverston Ave',49.62297,-125.02701,0,1449593159
-111504,'111504','Ulverston @ 7th St',49.62278,-125.02186,0,1449593160
-111505,'111505','7th St @ Penrith Ave',49.62088,-125.02107,0,1449593161
-111506,'111506','Royston @ Ulverston',49.62129,-125.00972,0,1449593162
-111507,'111507','Cumberland @ Stockand',49.62448,-125.02506,0,1449593163
-112064,'112064','Croydon @ Upland',49.87338,-125.13114,0,1449618332
-134002,'134002','Fitzgerald @ 16th St',49.68354,-124.99384,0,1451524768
-134003,'134003','5th St @ Pidcock Ave',49.68658,-125.00837,0,1451524769
-134004,'134004','Driftwood Mall',49.67567,-124.98438,0,1451524770
-134005,'134005','Kilpatrick @ 27th St',49.6735,-124.98503,0,1451524771
-134006,'134006','Cliffe @ Anfield',49.66794,-124.97726,0,1451524772
-134007,'134007','Cliffe @ Anfield',49.66781,-124.97689,0,1451524773
-134008,'134008','Guthrie @ Pritchard',49.68802,-124.91741,0,1451524774
-134009,'134009','Pritchard @ Guthrie',49.68825,-124.91687,0,1451524775
-134010,'134010','NIC / Aquatic Ctr',49.71121,-124.96839,0,1451524797
-134011,'134011','Ryan @ Anderton',49.71503,-124.93268,0,1451524798
-134012,'134012','Anderton @ Ryan',49.71571,-124.9336,0,1451524799
-134013,'134013','Malahat @ Elkhorn',49.7046,-124.96241,0,1451524800
-134014,'134014','Lerwick @ McDonald',49.69119,-124.94861,0,1451524801
-134016,'134016','Hwy 19A @ Rennison',49.72851,-124.99605,0,1451524803
-134017,'134017','Hwy 19A @ Sackville',49.78362,-125.05661,0,1451524804
-134018,'134018','Hwy 19A @ Merville',49.78349,-125.05693,0,1451524805
-134019,'134019','Hwy 19A @ White',49.83356,-125.12977,0,1451524806
-134020,'134020','MacAulay @ Hamm',49.84985,-125.13571,0,1451524828
-134021,'134021','Glenmore @ Lambeth',49.86991,-125.12904,0,1451524829
-134023,'134023','Hwy 19A @ Rennison',49.72833,-124.99572,0,1451524831
diff --git a/src/main/res-next/raw/next_gtfs_rts_trip_stops b/src/main/res-next/raw/next_gtfs_rts_trip_stops
deleted file mode 100644
index 09717a4f..00000000
--- a/src/main/res-next/raw/next_gtfs_rts_trip_stops
+++ /dev/null
@@ -1,526 +0,0 @@
-100,111275,1,0
-100,111276,2,0
-100,111277,3,0
-100,134005,4,0
-100,111278,5,0
-100,111280,6,0
-100,110539,7,0
-100,111281,8,0
-100,111282,9,0
-100,111284,10,0
-100,111286,11,0
-100,110530,12,0
-100,111381,13,0
-100,111296,14,0
-100,111297,15,0
-100,111298,16,0
-100,111476,17,0
-100,111477,18,0
-100,111300,19,0
-100,111301,20,0
-100,111373,21,0
-100,111302,22,0
-100,111303,23,0
-100,111304,24,0
-100,111305,25,0
-100,111306,26,0
-100,110532,27,0
-100,111347,28,0
-100,111348,29,0
-100,111349,30,0
-100,110531,31,1
-101,111323,1,0
-101,111324,2,0
-101,111325,3,0
-101,111326,4,0
-101,111367,5,0
-101,111368,6,0
-101,111369,7,0
-101,111370,8,0
-101,111371,9,0
-101,134014,10,0
-101,111372,11,0
-101,111374,12,0
-101,111375,13,0
-101,111478,14,0
-101,111377,15,0
-101,134010,16,0
-101,110305,17,0
-101,111378,18,0
-101,111379,19,0
-101,111380,20,0
-101,111489,21,0
-101,111486,22,1
-101,111270,23,0
-101,111488,24,0
-101,111271,25,0
-101,111474,26,0
-101,134002,27,0
-101,111272,28,0
-101,111273,29,0
-101,111274,30,0
-101,134004,31,0
-101,134006,32,0
-101,111275,33,1
-200,111290,1,0
-200,111291,2,0
-200,111292,3,0
-200,111293,4,0
-200,111501,5,0
-200,111500,6,0
-200,111294,7,0
-200,111502,8,0
-200,111295,9,0
-200,134006,10,0
-200,111275,11,1
-200,111277,12,0
-200,134005,13,0
-200,111278,14,1
-201,111275,1,0
-201,111276,2,0
-201,111507,3,0
-201,111503,4,0
-201,111504,5,0
-201,111505,6,0
-201,111289,7,0
-201,111290,8,1
-301,110531,1,0
-301,110537,2,0
-301,110538,3,0
-301,111352,4,0
-301,111353,5,0
-301,110552,6,0
-301,111355,7,0
-301,111356,8,0
-301,111357,9,0
-301,111358,10,0
-301,111359,11,0
-301,111360,12,0
-301,111361,13,0
-301,111362,14,0
-301,111363,15,0
-301,111364,16,0
-301,111365,17,0
-301,111366,18,0
-301,111367,19,0
-301,110532,20,0
-301,111327,21,0
-301,111328,22,0
-301,111329,23,0
-301,111330,24,0
-301,111331,25,0
-301,110533,26,0
-301,110534,27,0
-301,110535,28,0
-301,110536,29,0
-301,111322,30,0
-301,111323,31,1
-301,134008,32,0
-301,111370,33,0
-301,111371,34,0
-301,134014,35,0
-301,111372,36,0
-301,111374,37,0
-301,111375,38,0
-301,111479,39,1
-400,111278,1,0
-400,111459,2,0
-400,111337,3,0
-400,103871,4,0
-400,103870,5,0
-400,110545,6,0
-400,111340,7,0
-400,111349,8,0
-400,110531,9,1
-401,111323,1,0
-401,111324,2,0
-401,111332,3,0
-401,111333,4,0
-401,110377,5,0
-401,103872,6,0
-401,111336,7,0
-401,111499,8,0
-401,111278,9,1
-500,111278,1,0
-500,111459,2,0
-500,111337,3,0
-500,111486,4,0
-500,111381,5,0
-500,111296,6,0
-500,110270,7,0
-500,110526,8,1
-501,110526,1,0
-501,111380,2,0
-501,111489,3,0
-501,111486,4,1
-601,111486,1,0
-601,111381,2,0
-601,111296,3,0
-601,111297,4,0
-601,111298,5,0
-601,111384,6,0
-601,111456,7,0
-601,111473,8,0
-601,111455,9,0
-601,111385,10,0
-601,111386,11,0
-601,111387,12,0
-601,111388,13,0
-601,111389,14,0
-601,111481,15,0
-601,134013,16,0
-601,110565,17,0
-601,111480,18,0
-601,134010,19,0
-601,111299,20,0
-601,111476,21,0
-601,110248,22,0
-601,111390,23,0
-601,111391,24,0
-601,111392,25,0
-601,111393,26,0
-601,111394,27,0
-601,111463,28,0
-601,111395,29,0
-601,111396,30,0
-601,111378,31,0
-601,111379,32,0
-601,111380,33,0
-601,111489,34,0
-701,111486,1,0
-701,111397,2,0
-701,111398,3,0
-701,111399,4,0
-701,111400,5,0
-701,111401,6,0
-701,111457,7,0
-701,111464,8,0
-701,111402,9,0
-701,111465,10,0
-701,111491,11,0
-701,111404,12,0
-701,111405,13,0
-701,111406,14,0
-701,111461,15,0
-701,111407,16,0
-701,111467,17,0
-701,111408,18,0
-701,111409,19,0
-701,111410,20,0
-701,111411,21,0
-701,111413,22,0
-701,111414,23,0
-701,134004,24,0
-701,111278,25,1
-701,134003,26,0
-701,111432,27,0
-701,111286,28,0
-800,111275,1,0
-800,111276,2,0
-800,111277,3,0
-800,134005,4,0
-800,111278,5,0
-800,111423,6,0
-800,111412,7,0
-800,111424,8,0
-800,111425,9,0
-800,111426,10,0
-800,111427,11,0
-800,111428,12,0
-800,111429,13,0
-800,111430,14,0
-800,111417,15,0
-800,111431,16,0
-800,110550,17,0
-800,110566,18,0
-800,111432,19,0
-800,111286,20,0
-800,111486,21,1
-801,111486,1,0
-801,111397,2,0
-801,111415,3,0
-801,111416,4,0
-801,134003,5,0
-801,111398,6,0
-801,111399,7,0
-801,111404,8,0
-801,111405,9,0
-801,111406,10,0
-801,111418,11,0
-801,111419,12,0
-801,111420,13,0
-801,111421,14,0
-801,111422,15,0
-801,111408,16,0
-801,111409,17,0
-801,111410,18,0
-801,111411,19,0
-801,111413,20,0
-801,111414,21,0
-801,134004,22,0
-801,134006,23,0
-801,111275,24,1
-1000,111438,1,0
-1000,110551,2,0
-1000,103864,3,0
-1000,110336,4,0
-1000,103863,5,0
-1000,110337,6,0
-1000,111442,7,0
-1000,110338,8,0
-1000,103862,9,0
-1000,111483,10,0
-1000,103869,11,0
-1000,134007,12,0
-1000,111278,13,0
-1000,111459,14,0
-1000,111337,15,0
-1000,111383,16,0
-1000,110529,17,0
-1000,111486,18,1
-1000,111275,19,1
-1001,111486,1,0
-1001,110528,2,0
-1001,111382,3,0
-1001,111490,4,0
-1001,111336,5,0
-1001,111499,6,0
-1001,111278,7,0
-1001,134004,8,0
-1001,111275,9,0
-1001,111276,10,0
-1001,134006,11,0
-1001,110524,12,0
-1001,103868,13,0
-1001,103867,14,0
-1001,103865,15,0
-1001,110493,16,0
-1001,111435,17,0
-1001,110523,18,0
-1001,110324,19,0
-1001,111437,20,0
-1001,111438,21,1
-1100,111486,1,0
-1100,111381,2,0
-1100,111296,3,0
-1100,111297,4,0
-1100,111298,5,0
-1100,111476,6,0
-1100,111448,7,0
-1100,134012,8,0
-1100,110379,9,0
-1100,111449,10,0
-1100,111450,11,0
-1100,111451,12,0
-1100,111452,13,1
-1101,111452,1,0
-1101,110525,2,0
-1101,111475,3,0
-1101,134010,4,0
-1101,110305,5,0
-1101,111378,6,0
-1101,111379,7,0
-1101,111380,8,0
-1101,111489,9,0
-1101,111486,10,1
-1200,111486,1,0
-1200,111381,2,0
-1200,111296,3,0
-1200,110270,4,0
-1200,111492,5,0
-1200,110546,6,0
-1200,134023,7,0
-1200,134017,8,0
-1200,110542,9,0
-1200,110544,10,0
-1200,134019,11,0
-1200,134020,12,0
-1200,110398,13,0
-1200,134021,14,1
-1201,134021,1,0
-1201,112064,2,0
-1201,103860,3,0
-1201,110553,4,0
-1201,110554,5,0
-1201,110413,6,0
-1201,103861,7,0
-1201,110543,8,0
-1201,134018,9,0
-1201,134016,10,0
-1201,110547,11,0
-1201,110227,12,0
-1201,110303,13,0
-1201,134010,14,0
-1201,111299,15,0
-1201,110305,16,0
-1201,111378,17,0
-1201,111379,18,0
-1201,110526,19,0
-1201,111380,20,0
-1201,111489,21,0
-1201,111486,22,1
-1301,111486,1,0
-1301,111381,2,0
-1301,111296,3,0
-1301,111297,4,0
-1301,111298,5,0
-1301,111299,6,0
-1301,111476,7,0
-1301,111448,8,0
-1301,134012,9,0
-1301,110379,10,0
-1301,110397,11,0
-1301,110420,12,0
-1301,134017,13,0
-1301,110448,14,0
-1301,110526,15,0
-1301,111380,16,0
-1301,111489,17,0
-1400,103863,1,0
-1400,110337,2,0
-1400,111442,3,0
-1400,110338,4,0
-1400,103862,5,0
-1400,111483,6,0
-1400,103869,7,0
-1400,111275,8,0
-1400,111276,9,0
-1400,111277,10,0
-1400,134005,11,0
-1400,111278,12,0
-1400,111280,13,0
-1400,110539,14,0
-1400,111281,15,0
-1400,111282,16,0
-1400,111284,17,0
-1400,111286,18,0
-1400,111486,19,1
-1401,111486,1,0
-1401,111488,2,0
-1401,111271,3,0
-1401,111474,4,0
-1401,134002,5,0
-1401,111272,6,0
-1401,111273,7,0
-1401,111274,8,0
-1401,134004,9,0
-1401,111278,10,0
-1401,134006,11,0
-1401,110524,12,0
-1401,103868,13,0
-1401,103867,14,0
-1401,103865,15,0
-1401,110493,16,0
-1401,111435,17,0
-1401,110523,18,0
-1401,103863,19,1
-1500,111476,1,0
-1500,111384,2,0
-1500,111456,3,0
-1500,111473,4,0
-1500,110560,5,0
-1500,110558,6,0
-1500,110556,7,0
-1500,111340,8,0
-1500,111349,9,0
-1500,110531,10,1
-1501,110531,1,0
-1501,110537,2,0
-1501,111322,3,0
-1501,111324,4,0
-1501,111332,5,0
-1501,110555,6,0
-1501,110557,7,0
-1501,110559,8,0
-1501,110561,9,0
-1501,111476,10,1
-2001,111278,1,0
-2001,134006,2,0
-2001,111275,3,0
-2001,111276,4,0
-2001,103868,5,0
-2001,103867,6,0
-2001,103862,7,0
-2001,111506,8,0
-2001,111288,9,0
-2001,111289,10,0
-2001,111290,11,1
-9900,111486,1,0
-9900,111381,2,0
-9900,111296,3,0
-9900,111297,4,0
-9900,111298,5,0
-9900,111448,6,0
-9900,134011,7,0
-9900,103873,8,0
-9900,111450,9,0
-9900,111451,10,0
-9900,134008,11,0
-9900,111370,12,0
-9900,111371,13,0
-9900,134014,14,0
-9900,111372,15,0
-9900,111374,16,0
-9900,111375,17,0
-9900,111479,18,0
-9900,111478,19,0
-9900,111377,20,0
-9900,110248,21,0
-9900,111390,22,0
-9900,111391,23,0
-9900,111392,24,0
-9900,111393,25,0
-9900,111394,26,0
-9900,111463,27,0
-9900,111395,28,0
-9900,111396,29,0
-9900,111384,30,0
-9900,111456,31,0
-9900,111473,32,0
-9900,111455,33,0
-9900,111385,34,0
-9900,111386,35,0
-9900,111387,36,0
-9900,111388,37,0
-9900,111389,38,0
-9900,111481,39,0
-9900,110247,40,0
-9900,110526,41,0
-9900,111380,42,0
-9900,111489,43,0
-9901,111492,1,0
-9901,110227,2,0
-9901,111390,3,0
-9901,111391,4,0
-9901,111392,5,0
-9901,111393,6,0
-9901,111394,7,0
-9901,111463,8,0
-9901,111395,9,0
-9901,111396,10,0
-9901,111384,11,0
-9901,111456,12,0
-9901,111473,13,0
-9901,111455,14,0
-9901,111385,15,0
-9901,111386,16,0
-9901,111387,17,0
-9901,111388,18,0
-9901,111389,19,0
-9901,111481,20,0
-9901,111479,21,0
-9901,111301,22,0
-9901,111373,23,0
-9901,111302,24,0
-9901,111303,25,0
-9901,111304,26,0
-9901,134009,27,0
-9901,103874,28,0
-9901,111475,29,0
-9901,134010,30,0
-9901,111299,31,0
-9901,111378,32,0
-9901,111379,33,0
-9901,111380,34,0
-9901,111489,35,0
-9901,111486,36,1
diff --git a/src/main/res-next/raw/next_gtfs_rts_trips b/src/main/res-next/raw/next_gtfs_rts_trips
deleted file mode 100644
index b0795f34..00000000
--- a/src/main/res-next/raw/next_gtfs_rts_trips
+++ /dev/null
@@ -1,27 +0,0 @@
-101,0,'Anfield Ctr -',1
-100,0,'Comox Mall -',1
-200,0,'Anfield Ctr',2
-201,0,'Cumberland',2
-301,0,'Comox Local',3
-400,0,'Comox Mall -',4
-401,0,'Driftwood Mall -',4
-500,0,'Comox Vly Sports Ctr',5
-501,0,'Downtown Courtenay',5
-601,0,'Uplands',6
-701,0,'Driftwood Mall',7
-801,0,'Anfield Ctr -',8
-800,0,'Downtown -',8
-1000,0,'Downtown Courtenay',10
-1001,0,'Fanny Bay -',10
-1100,0,'Airport',11
-1101,0,'Downtown',11
-1201,0,'Downtown Courtenay -',12
-1200,0,'Oyster River -',12
-1301,0,'Seal Bay - Merville',13
-1400,0,'Downtown',14
-1401,0,'Union Bay',14
-1501,0,'Aquatic Ctr -',15
-1500,0,'Comox Mall -',15
-2001,0,'Cumberland -',20
-9900,0,'AM',99
-9901,0,'PM',99
diff --git a/src/main/res-next/raw/next_gtfs_schedule_service_dates b/src/main/res-next/raw/next_gtfs_schedule_service_dates
deleted file mode 100644
index 12e7cf18..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_service_dates
+++ /dev/null
@@ -1,207 +0,0 @@
-'2655',20240401,1
-'2656',20240401,1
-'2655',20240402,1
-'2656',20240402,1
-'2657',20240402,1
-'2655',20240403,1
-'2656',20240403,1
-'2658',20240403,1
-'2655',20240404,1
-'2656',20240404,1
-'2657',20240404,1
-'2089',20240405,1
-'2655',20240405,1
-'2658',20240405,1
-'2660',20240406,1
-'2661',20240407,1
-'2655',20240408,1
-'2656',20240408,1
-'2655',20240409,1
-'2656',20240409,1
-'2657',20240409,1
-'2655',20240410,1
-'2656',20240410,1
-'2658',20240410,1
-'2655',20240411,1
-'2656',20240411,1
-'2657',20240411,1
-'2089',20240412,1
-'2655',20240412,1
-'2658',20240412,1
-'2660',20240413,1
-'2661',20240414,1
-'2655',20240415,1
-'2656',20240415,1
-'2655',20240416,1
-'2656',20240416,1
-'2657',20240416,1
-'2655',20240417,1
-'2656',20240417,1
-'2658',20240417,1
-'2655',20240418,1
-'2656',20240418,1
-'2657',20240418,1
-'2089',20240419,1
-'2655',20240419,1
-'2658',20240419,1
-'2660',20240420,1
-'2661',20240421,1
-'2655',20240422,1
-'2656',20240422,1
-'2655',20240423,1
-'2656',20240423,1
-'2657',20240423,1
-'2655',20240424,1
-'2656',20240424,1
-'2658',20240424,1
-'2655',20240425,1
-'2656',20240425,1
-'2657',20240425,1
-'2089',20240426,1
-'2655',20240426,1
-'2658',20240426,1
-'2660',20240427,1
-'2661',20240428,1
-'2655',20240429,1
-'2656',20240429,1
-'2655',20240430,1
-'2656',20240430,1
-'2657',20240430,1
-'2655',20240501,1
-'2656',20240501,1
-'2658',20240501,1
-'2655',20240502,1
-'2656',20240502,1
-'2657',20240502,1
-'2089',20240503,1
-'2655',20240503,1
-'2658',20240503,1
-'2660',20240504,1
-'2661',20240505,1
-'2655',20240506,1
-'2656',20240506,1
-'2655',20240507,1
-'2656',20240507,1
-'2657',20240507,1
-'2655',20240508,1
-'2656',20240508,1
-'2658',20240508,1
-'2655',20240509,1
-'2656',20240509,1
-'2657',20240509,1
-'2089',20240510,1
-'2655',20240510,1
-'2658',20240510,1
-'2660',20240511,1
-'2661',20240512,1
-'2655',20240513,1
-'2656',20240513,1
-'2655',20240514,1
-'2656',20240514,1
-'2657',20240514,1
-'2655',20240515,1
-'2656',20240515,1
-'2658',20240515,1
-'2655',20240516,1
-'2656',20240516,1
-'2657',20240516,1
-'2089',20240517,1
-'2655',20240517,1
-'2658',20240517,1
-'2660',20240518,1
-'2661',20240519,1
-'2660',20240520,1
-'2655',20240521,1
-'2656',20240521,1
-'2657',20240521,1
-'2655',20240522,1
-'2656',20240522,1
-'2658',20240522,1
-'2655',20240523,1
-'2656',20240523,1
-'2657',20240523,1
-'2089',20240524,1
-'2655',20240524,1
-'2658',20240524,1
-'2660',20240525,1
-'2661',20240526,1
-'2655',20240527,1
-'2656',20240527,1
-'2655',20240528,1
-'2656',20240528,1
-'2657',20240528,1
-'2655',20240529,1
-'2656',20240529,1
-'2658',20240529,1
-'2655',20240530,1
-'2656',20240530,1
-'2657',20240530,1
-'2089',20240531,1
-'2655',20240531,1
-'2658',20240531,1
-'2660',20240601,1
-'2661',20240602,1
-'2655',20240603,1
-'2656',20240603,1
-'2655',20240604,1
-'2656',20240604,1
-'2657',20240604,1
-'2655',20240605,1
-'2656',20240605,1
-'2658',20240605,1
-'2655',20240606,1
-'2656',20240606,1
-'2657',20240606,1
-'2089',20240607,1
-'2655',20240607,1
-'2658',20240607,1
-'2660',20240608,1
-'2661',20240609,1
-'2655',20240610,1
-'2656',20240610,1
-'2655',20240611,1
-'2656',20240611,1
-'2657',20240611,1
-'2655',20240612,1
-'2656',20240612,1
-'2658',20240612,1
-'2655',20240613,1
-'2656',20240613,1
-'2657',20240613,1
-'2089',20240614,1
-'2655',20240614,1
-'2658',20240614,1
-'2660',20240615,1
-'2661',20240616,1
-'2655',20240617,1
-'2656',20240617,1
-'2655',20240618,1
-'2656',20240618,1
-'2657',20240618,1
-'2655',20240619,1
-'2656',20240619,1
-'2658',20240619,1
-'2655',20240620,1
-'2656',20240620,1
-'2657',20240620,1
-'2089',20240621,1
-'2655',20240621,1
-'2658',20240621,1
-'2660',20240622,1
-'2661',20240623,1
-'2655',20240624,1
-'2656',20240624,1
-'2655',20240625,1
-'2656',20240625,1
-'2657',20240625,1
-'2655',20240626,1
-'2656',20240626,1
-'2658',20240626,1
-'2655',20240627,1
-'2656',20240627,1
-'2657',20240627,1
-'2089',20240628,1
-'2655',20240628,1
-'2658',20240628,1
-'2660',20240629,1
-'2661',20240630,1
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103860 b/src/main/res-next/raw/next_gtfs_schedule_stop_103860
deleted file mode 100644
index 5c9315d7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103860
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,65100,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,122300,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103861 b/src/main/res-next/raw/next_gtfs_schedule_stop_103861
deleted file mode 100644
index 85b33557..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103861
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,70000,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,123200,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103862 b/src/main/res-next/raw/next_gtfs_schedule_stop_103862
deleted file mode 100644
index 3a80f731..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103862
+++ /dev/null
@@ -1,7 +0,0 @@
-'2655',1000,75500,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,101900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113600,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90800,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
-'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103863 b/src/main/res-next/raw/next_gtfs_schedule_stop_103863
deleted file mode 100644
index 068a0670..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103863
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',1000,75700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,101100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,112800,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90000,,'',0,21400,,'',0,48600,,'',0
-'2657',1401,85200,4,'',0,25400,4,'',0,44600,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103864 b/src/main/res-next/raw/next_gtfs_schedule_stop_103864
deleted file mode 100644
index 1251b206..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103864
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1000,75100,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,100500,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,112200,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103865 b/src/main/res-next/raw/next_gtfs_schedule_stop_103865
deleted file mode 100644
index 4b6b5342..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103865
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1001,71900,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,93300,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,105000,,'',0,68200,,'',0
-'2657',1401,84500,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103867 b/src/main/res-next/raw/next_gtfs_schedule_stop_103867
deleted file mode 100644
index e1229efb..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103867
+++ /dev/null
@@ -1,7 +0,0 @@
-'2655',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,93000,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,104700,,'',0,68200,,'',0
-'2657',1401,84300,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
-'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103868 b/src/main/res-next/raw/next_gtfs_schedule_stop_103868
deleted file mode 100644
index 04b8ab88..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103868
+++ /dev/null
@@ -1,7 +0,0 @@
-'2655',1001,71600,,'',0,21400,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2660',1001,93000,,'',0,40000,,'',0,40000,,'',0,37500,,'',0
-'2661',1001,104700,,'',0,68200,,'',0
-'2657',1401,84300,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,102600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,80500,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
-'2661',2001,130500,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103869 b/src/main/res-next/raw/next_gtfs_schedule_stop_103869
deleted file mode 100644
index 213a5727..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103869
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1000,75700,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,102100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103870 b/src/main/res-next/raw/next_gtfs_schedule_stop_103870
deleted file mode 100644
index 9941843a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103870
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',400,80700,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90400,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124500,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103871 b/src/main/res-next/raw/next_gtfs_schedule_stop_103871
deleted file mode 100644
index b7ed7a66..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103871
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',400,80600,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90300,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124400,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103872 b/src/main/res-next/raw/next_gtfs_schedule_stop_103872
deleted file mode 100644
index 2fa15123..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103872
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',401,85700,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,18900,,'',0,11700,,'',0,10500,,'',0
-'2660',401,85200,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
-'2661',401,91700,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103873 b/src/main/res-next/raw/next_gtfs_schedule_stop_103873
deleted file mode 100644
index ca3839cc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103873
+++ /dev/null
@@ -1 +0,0 @@
-'2655',9900,80900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_103874 b/src/main/res-next/raw/next_gtfs_schedule_stop_103874
deleted file mode 100644
index 9925d98c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_103874
+++ /dev/null
@@ -1 +0,0 @@
-'2655',9901,155700,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110227 b/src/main/res-next/raw/next_gtfs_schedule_stop_110227
deleted file mode 100644
index bee00a03..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110227
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,71800,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2655',9901,152700,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110247 b/src/main/res-next/raw/next_gtfs_schedule_stop_110247
deleted file mode 100644
index 2dc2ebcc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110247
+++ /dev/null
@@ -1 +0,0 @@
-'2655',9900,85100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110248 b/src/main/res-next/raw/next_gtfs_schedule_stop_110248
deleted file mode 100644
index 19542959..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110248
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',601,63900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,101900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,82800,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110270 b/src/main/res-next/raw/next_gtfs_schedule_stop_110270
deleted file mode 100644
index 98bfdf02..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110270
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',500,81500,0,'Vanier',0,3000,0,'Vanier',0,67400,0,'Vanier',0,10400,0,'Vanier',0
-'2660',500,152600,0,'Vanier',0
-'2655',1200,60900,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,114000,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110303 b/src/main/res-next/raw/next_gtfs_schedule_stop_110303
deleted file mode 100644
index 8472a6f7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110303
+++ /dev/null
@@ -1 +0,0 @@
-'2655',1201,72100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110305 b/src/main/res-next/raw/next_gtfs_schedule_stop_110305
deleted file mode 100644
index 00b929f6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110305
+++ /dev/null
@@ -1,8 +0,0 @@
-'2089',101,164200,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,60200,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15500,,'',0
-'2656',101,164200,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73400,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
-'2661',101,92000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
-'2655',1101,73400,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
-'2660',1101,100800,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
-'2655',1201,72500,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110324 b/src/main/res-next/raw/next_gtfs_schedule_stop_110324
deleted file mode 100644
index 3101fbf2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110324
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1001,73200,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,94600,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,110300,,'',0,64200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110336 b/src/main/res-next/raw/next_gtfs_schedule_stop_110336
deleted file mode 100644
index 503389ab..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110336
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1000,75500,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,100900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,112600,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110337 b/src/main/res-next/raw/next_gtfs_schedule_stop_110337
deleted file mode 100644
index 5f3e0913..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110337
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1000,80200,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,101600,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113300,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90500,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110338 b/src/main/res-next/raw/next_gtfs_schedule_stop_110338
deleted file mode 100644
index 262f5ec8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110338
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1000,80400,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,101800,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113500,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90700,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110377 b/src/main/res-next/raw/next_gtfs_schedule_stop_110377
deleted file mode 100644
index 26cf51d6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110377
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',401,85600,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,15000,,'',0,15700,,'',0,10500,,'',0
-'2660',401,85100,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
-'2661',401,91600,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110379 b/src/main/res-next/raw/next_gtfs_schedule_stop_110379
deleted file mode 100644
index 7dcca0ec..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110379
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'2660',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
-'2657',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110397 b/src/main/res-next/raw/next_gtfs_schedule_stop_110397
deleted file mode 100644
index b8ca82c2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110397
+++ /dev/null
@@ -1 +0,0 @@
-'2657',1301,95600,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110398 b/src/main/res-next/raw/next_gtfs_schedule_stop_110398
deleted file mode 100644
index 11ecb1ee..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110398
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,63400,,'',0,17000,,'',0,40100,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
-'2660',1200,120500,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110413 b/src/main/res-next/raw/next_gtfs_schedule_stop_110413
deleted file mode 100644
index f16f0ab3..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110413
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,65600,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,122800,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110420 b/src/main/res-next/raw/next_gtfs_schedule_stop_110420
deleted file mode 100644
index d6cbc6eb..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110420
+++ /dev/null
@@ -1 +0,0 @@
-'2657',1301,95800,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110448 b/src/main/res-next/raw/next_gtfs_schedule_stop_110448
deleted file mode 100644
index 4d467f40..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110448
+++ /dev/null
@@ -1 +0,0 @@
-'2657',1301,100900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110493 b/src/main/res-next/raw/next_gtfs_schedule_stop_110493
deleted file mode 100644
index 4998f3fd..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110493
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1001,72000,,'',0,3600,,'',0,17800,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,93400,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,105100,,'',0,68200,,'',0
-'2657',1401,84700,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110523 b/src/main/res-next/raw/next_gtfs_schedule_stop_110523
deleted file mode 100644
index 2622c812..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110523
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1001,72500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,93900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,105600,,'',0,68200,,'',0
-'2657',1401,85200,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110524 b/src/main/res-next/raw/next_gtfs_schedule_stop_110524
deleted file mode 100644
index c137aee3..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110524
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1001,75200,,'',0
-'2657',1401,84200,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110525 b/src/main/res-next/raw/next_gtfs_schedule_stop_110525
deleted file mode 100644
index 54bd7244..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110525
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1101,72400,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1101,95700,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110526 b/src/main/res-next/raw/next_gtfs_schedule_stop_110526
deleted file mode 100644
index 379bba91..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110526
+++ /dev/null
@@ -1,7 +0,0 @@
-'2655',500,81800,4,'',0,3000,4,'',0,67500,4,'',0,10400,4,'',0
-'2655',501,81800,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'2660',500,153000,4,'',0
-'2660',501,153000,0,'Vanier',0
-'2660',1201,125100,,'',0,60000,,'',0
-'2657',1301,102100,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,85400,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110528 b/src/main/res-next/raw/next_gtfs_schedule_stop_110528
deleted file mode 100644
index 99d4a17f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110528
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1001,70100,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1001,91500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110529 b/src/main/res-next/raw/next_gtfs_schedule_stop_110529
deleted file mode 100644
index aefdbcff..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110529
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1000,80600,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2660',1000,103000,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110530 b/src/main/res-next/raw/next_gtfs_schedule_stop_110530
deleted file mode 100644
index 4a8b6a86..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110530
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,171700,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,63000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171700,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,74500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92400,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110531 b/src/main/res-next/raw/next_gtfs_schedule_stop_110531
deleted file mode 100644
index 27048801..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110531
+++ /dev/null
@@ -1,15 +0,0 @@
-'2089',100,153700,4,'',0,20100,4,'',0,27300,4,'',0,12000,4,'',0,10500,4,'',0,17500,4,'',0
-'2655',100,64800,4,'',0,7000,4,'',0,1900,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1600,4,'',0,6500,4,'',0,2000,4,'',0,6200,4,'',0,2000,4,'',0,2100,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,7000,4,'',0,1800,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,8300,4,'',0,2600,4,'',0,7500,4,'',0,3500,4,'',0,11400,4,'',0
-'2656',100,153700,4,'',0,20100,4,'',0,27300,4,'',0,12000,4,'',0,10500,4,'',0
-'2660',100,80500,4,'',0,9900,4,'',0,4100,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8100,4,'',0,8100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3300,4,'',0,7900,4,'',0,7900,4,'',0,4000,4,'',0,8000,4,'',0,10500,4,'',0,17500,4,'',0
-'2661',100,94500,4,'',0,8500,4,'',0,9500,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,9000,4,'',0,10000,4,'',0,9800,4,'',0,9800,4,'',0,5000,4,'',0,9900,4,'',0
-'2089',301,154500,,'',0,19800,,'',0
-'2655',301,73100,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,154500,,'',0,19800,,'',0
-'2660',301,81000,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,84000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
-'2655',400,81400,4,'',0,10300,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,19000,4,'',0,11400,4,'',0,16400,4,'',0
-'2660',400,91200,4,'',0,12200,4,'',0,11500,4,'',0,15600,4,'',0,11000,4,'',0,10000,4,'',0,10300,4,'',0,12200,4,'',0,16100,4,'',0
-'2661',400,125300,4,'',0,29200,4,'',0,38200,4,'',0
-'2658',1500,93700,4,'',0,8000,4,'',0,4000,4,'',0,28000,4,'',0,8000,4,'',0,4000,4,'',0
-'2658',1501,90000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110532 b/src/main/res-next/raw/next_gtfs_schedule_stop_110532
deleted file mode 100644
index b6c2343a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110532
+++ /dev/null
@@ -1,10 +0,0 @@
-'2089',100,153300,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64500,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153300,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80200,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,94100,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,9900,,'',0
-'2089',301,160000,,'',0,15800,,'',0
-'2655',301,82900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160000,,'',0,15800,,'',0
-'2660',301,82500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110533 b/src/main/res-next/raw/next_gtfs_schedule_stop_110533
deleted file mode 100644
index d387afc8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110533
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160500,,'',0,19800,,'',0
-'2655',301,83400,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160500,,'',0,19800,,'',0
-'2660',301,83000,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110534 b/src/main/res-next/raw/next_gtfs_schedule_stop_110534
deleted file mode 100644
index d30eda3c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110534
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160800,,'',0,19800,,'',0
-'2655',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160800,,'',0,19800,,'',0
-'2660',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110535 b/src/main/res-next/raw/next_gtfs_schedule_stop_110535
deleted file mode 100644
index d30eda3c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110535
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160800,,'',0,19800,,'',0
-'2655',301,83700,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160800,,'',0,19800,,'',0
-'2660',301,83300,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,90200,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110536 b/src/main/res-next/raw/next_gtfs_schedule_stop_110536
deleted file mode 100644
index c82de479..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110536
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160900,,'',0,19800,,'',0
-'2655',301,83800,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160900,,'',0,19800,,'',0
-'2660',301,83400,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,90300,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110537 b/src/main/res-next/raw/next_gtfs_schedule_stop_110537
deleted file mode 100644
index e47c86ab..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110537
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',301,154600,,'',0,19800,,'',0
-'2655',301,73200,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,154600,,'',0,19800,,'',0
-'2660',301,81100,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,84100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
-'2658',1501,90100,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110538 b/src/main/res-next/raw/next_gtfs_schedule_stop_110538
deleted file mode 100644
index 64d7a64f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110538
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,154700,,'',0,19800,,'',0
-'2655',301,73300,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,154700,,'',0,19800,,'',0
-'2660',301,81200,,'',0,11700,,'',0,11600,,'',0,11400,,'',0,15600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110539 b/src/main/res-next/raw/next_gtfs_schedule_stop_110539
deleted file mode 100644
index 9fdcb4f6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110539
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,171200,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171200,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2657',1400,91800,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110542 b/src/main/res-next/raw/next_gtfs_schedule_stop_110542
deleted file mode 100644
index fd4c5d84..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110542
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,62400,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,115500,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110543 b/src/main/res-next/raw/next_gtfs_schedule_stop_110543
deleted file mode 100644
index d28fb8d0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110543
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,70100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,123300,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110544 b/src/main/res-next/raw/next_gtfs_schedule_stop_110544
deleted file mode 100644
index 09238ed1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110544
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,62700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,115800,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110545 b/src/main/res-next/raw/next_gtfs_schedule_stop_110545
deleted file mode 100644
index 1714850f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110545
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',400,80800,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90500,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124600,,'',0,29200,,'',0,38300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110546 b/src/main/res-next/raw/next_gtfs_schedule_stop_110546
deleted file mode 100644
index d366a424..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110546
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,61300,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,114400,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110547 b/src/main/res-next/raw/next_gtfs_schedule_stop_110547
deleted file mode 100644
index 860aad83..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110547
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,71600,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,124800,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110550 b/src/main/res-next/raw/next_gtfs_schedule_stop_110550
deleted file mode 100644
index 0508866a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110550
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63400,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
-'2660',800,84300,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,95000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110551 b/src/main/res-next/raw/next_gtfs_schedule_stop_110551
deleted file mode 100644
index 7e211d3c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110551
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1000,74700,,'',0,7500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,100100,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,111800,0,'Downtown',0,68400,0,'Downtown',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110552 b/src/main/res-next/raw/next_gtfs_schedule_stop_110552
deleted file mode 100644
index 8e08d9fb..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110552
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155000,,'',0,19800,,'',0
-'2655',301,73600,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155000,,'',0,19800,,'',0
-'2660',301,81500,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84500,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110553 b/src/main/res-next/raw/next_gtfs_schedule_stop_110553
deleted file mode 100644
index 8937a293..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110553
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,65200,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,122400,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110554 b/src/main/res-next/raw/next_gtfs_schedule_stop_110554
deleted file mode 100644
index 1577bfee..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110554
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,65300,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,122500,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110555 b/src/main/res-next/raw/next_gtfs_schedule_stop_110555
deleted file mode 100644
index 3fa727db..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110555
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1501,90700,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110556 b/src/main/res-next/raw/next_gtfs_schedule_stop_110556
deleted file mode 100644
index 1ae0e491..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110556
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1500,93100,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110557 b/src/main/res-next/raw/next_gtfs_schedule_stop_110557
deleted file mode 100644
index 13b31850..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110557
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1501,90800,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110558 b/src/main/res-next/raw/next_gtfs_schedule_stop_110558
deleted file mode 100644
index 68df2693..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110558
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1500,92900,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110559 b/src/main/res-next/raw/next_gtfs_schedule_stop_110559
deleted file mode 100644
index 43e056e0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110559
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1501,91000,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110560 b/src/main/res-next/raw/next_gtfs_schedule_stop_110560
deleted file mode 100644
index 1cc8fcc3..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110560
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1500,92700,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110561 b/src/main/res-next/raw/next_gtfs_schedule_stop_110561
deleted file mode 100644
index a5d447f5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110561
+++ /dev/null
@@ -1 +0,0 @@
-'2658',1501,91400,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110565 b/src/main/res-next/raw/next_gtfs_schedule_stop_110565
deleted file mode 100644
index 5ba77077..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110565
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',601,63300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,101300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_110566 b/src/main/res-next/raw/next_gtfs_schedule_stop_110566
deleted file mode 100644
index c2bb13ed..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_110566
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63600,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
-'2660',800,84500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
-'2661',800,95200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111270 b/src/main/res-next/raw/next_gtfs_schedule_stop_111270
deleted file mode 100644
index 2fa4cce5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111270
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',101,164800,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60700,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
-'2656',101,164800,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111271 b/src/main/res-next/raw/next_gtfs_schedule_stop_111271
deleted file mode 100644
index 353a2af3..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111271
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165000,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165000,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83100,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111272 b/src/main/res-next/raw/next_gtfs_schedule_stop_111272
deleted file mode 100644
index ffafe03a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111272
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165300,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,61100,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165300,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74400,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,93100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83300,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111273 b/src/main/res-next/raw/next_gtfs_schedule_stop_111273
deleted file mode 100644
index e1a5a6e2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111273
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111274 b/src/main/res-next/raw/next_gtfs_schedule_stop_111274
deleted file mode 100644
index e1a5a6e2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111274
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,61200,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165400,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74500,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,93200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111275 b/src/main/res-next/raw/next_gtfs_schedule_stop_111275
deleted file mode 100644
index fbdbeacc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111275
+++ /dev/null
@@ -1,30 +0,0 @@
-'2089',100,170700,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2089',101,165900,4,'',0,28100,4,'',0,11800,4,'',0,14500,4,'',0,10900,4,'',0
-'2655',100,62200,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2655',101,61700,4,'',0,2900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5700,4,'',0,1500,4,'',0,2500,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,3100,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,3000,4,'',0,7100,4,'',0,2000,4,'',0,1000,4,'',0,1000,4,'',0,6000,4,'',0,2000,4,'',0,8400,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,11500,4,'',0
-'2656',100,170700,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2656',101,165900,4,'',0,28100,4,'',0,11800,4,'',0,14500,4,'',0
-'2660',100,83500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2660',101,74900,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,4000,4,'',0,8000,4,'',0,7900,4,'',0,4000,4,'',0,14500,4,'',0,10900,4,'',0
-'2661',100,91500,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2661',101,93600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,8900,4,'',0,10000,4,'',0,9900,4,'',0,9400,4,'',0,8900,4,'',0,9800,4,'',0
-'2089',200,233900,4,'',0
-'2089',201,231200,,'',0
-'2655',200,64200,4,'',0,8500,4,'',0,12500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,14900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,4000,4,'',0,9000,4,'',0,11500,4,'',0,15500,4,'',0,14000,4,'',0
-'2655',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,83100,4,'',0,11000,4,'',0,11500,4,'',0,15000,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,10000,4,'',0,11500,4,'',0,16000,4,'',0,14000,4,'',0,19300,4,'',0
-'2660',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',200,95600,4,'',0,37500,4,'',0,20000,4,'',0,19700,4,'',0,19400,4,'',0
-'2661',201,92900,,'',0,77200,,'',0,15400,,'',0
-'2655',800,62200,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2655',801,70000,4,'',0,12500,4,'',0,9500,4,'',0,9800,4,'',0,10500,4,'',0,10900,4,'',0,10700,4,'',0,9300,4,'',0,12100,4,'',0,14900,4,'',0,12200,4,'',0,11500,4,'',0,18000,4,'',0
-'2660',800,83100,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2660',801,91400,4,'',0,10800,4,'',0,11000,4,'',0,10700,4,'',0,10500,4,'',0,9800,4,'',0,11500,4,'',0,14700,4,'',0,11500,4,'',0,11300,4,'',0,18700,4,'',0
-'2661',800,93800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
-'2661',801,105500,4,'',0,20200,4,'',0,19700,4,'',0,20100,4,'',0,20000,4,'',0
-'2661',1000,114000,4,'',0,68400,4,'',0
-'2661',1001,104000,,'',0,68200,,'',0
-'2657',1400,91200,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
-'2661',2001,125700,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111276 b/src/main/res-next/raw/next_gtfs_schedule_stop_111276
deleted file mode 100644
index eea21f57..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111276
+++ /dev/null
@@ -1,17 +0,0 @@
-'2089',100,170800,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62300,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,170800,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91600,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2089',201,231200,,'',0
-'2655',201,61500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,91400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,92900,,'',0,77200,,'',0,15400,,'',0
-'2655',800,62300,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83200,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,93900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
-'2661',1001,104000,,'',0,68200,,'',0
-'2657',1400,91300,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,101800,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,75700,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
-'2661',2001,125700,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111277 b/src/main/res-next/raw/next_gtfs_schedule_stop_111277
deleted file mode 100644
index 6ca4077c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111277
+++ /dev/null
@@ -1,10 +0,0 @@
-'2089',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2655',200,75700,0,'Comox Mall',0
-'2655',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9500,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83300,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27600,,'',0
-'2657',1400,91400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111278 b/src/main/res-next/raw/next_gtfs_schedule_stop_111278
deleted file mode 100644
index 77765311..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111278
+++ /dev/null
@@ -1,25 +0,0 @@
-'2089',100,171000,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62500,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171000,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83800,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91800,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2655',200,75800,4,'',0
-'2655',400,80200,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2655',401,90200,4,'',0,10100,4,'',0,10600,4,'',0,10000,4,'',0,10800,4,'',0,10100,4,'',0,19000,4,'',0,11500,4,'',0,10400,4,'',0
-'2660',400,85900,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2660',401,85700,4,'',0,16200,4,'',0,11500,4,'',0,11600,4,'',0,15000,4,'',0,10000,4,'',0,13200,4,'',0,10400,4,'',0,10100,4,'',0
-'2661',400,124000,,'',0,29200,,'',0,38300,,'',0
-'2661',401,92300,4,'',0,31500,4,'',0,29200,4,'',0
-'2655',500,80700,0,'Vanier',0,3000,0,'Vanier',0
-'2655',701,80300,4,'',0,74900,4,'',0,8200,4,'',0
-'2660',701,90600,4,'',0,65300,4,'',0
-'2655',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
-'2655',1000,80200,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2655',1001,70700,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1000,102600,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1001,92100,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2657',1400,91500,,'',0,21400,,'',0,48700,,'',0
-'2657',1401,83600,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,160900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111280 b/src/main/res-next/raw/next_gtfs_schedule_stop_111280
deleted file mode 100644
index 7748a796..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111280
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,171100,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62600,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171100,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83900,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91900,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2657',1400,91700,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111281 b/src/main/res-next/raw/next_gtfs_schedule_stop_111281
deleted file mode 100644
index a340047d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111281
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,171300,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62700,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171300,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
-'2660',100,84000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92000,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2657',1400,91900,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111282 b/src/main/res-next/raw/next_gtfs_schedule_stop_111282
deleted file mode 100644
index f53e91f0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111282
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,171400,,'',0,23700,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171400,,'',0,23700,,'',0,16000,,'',0,10500,,'',0
-'2660',100,84100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92100,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2657',1400,92000,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111284 b/src/main/res-next/raw/next_gtfs_schedule_stop_111284
deleted file mode 100644
index 08becee5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111284
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,171500,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62800,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171500,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,84200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92200,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2657',1400,92100,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111286 b/src/main/res-next/raw/next_gtfs_schedule_stop_111286
deleted file mode 100644
index b16211ad..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111286
+++ /dev/null
@@ -1,11 +0,0 @@
-'2089',100,171600,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62900,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171600,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,84300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92300,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',701,70500,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,111000,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
-'2655',800,63800,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
-'2660',800,84700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
-'2661',800,95400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
-'2657',1400,92200,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111288 b/src/main/res-next/raw/next_gtfs_schedule_stop_111288
deleted file mode 100644
index 4f86f8b1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111288
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',2001,103500,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,81400,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
-'2661',2001,131400,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111289 b/src/main/res-next/raw/next_gtfs_schedule_stop_111289
deleted file mode 100644
index 305a3b94..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111289
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',201,232300,,'',0
-'2655',201,62600,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,92500,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,94000,,'',0,77200,,'',0,19400,,'',0
-'2655',2001,103600,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,81500,,'',0,22500,,'',0,11000,,'',0,35000,,'',0,11500,,'',0,33500,,'',0
-'2661',2001,131500,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111290 b/src/main/res-next/raw/next_gtfs_schedule_stop_111290
deleted file mode 100644
index adaf930a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111290
+++ /dev/null
@@ -1,11 +0,0 @@
-'2089',200,232300,,'',0
-'2089',201,232300,4,'',0
-'2655',200,62600,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2655',201,62600,4,'',0,8500,4,'',0,2900,4,'',0,9600,4,'',0,9500,4,'',0,41900,4,'',0,20000,4,'',0,28500,4,'',0,11500,4,'',0,18000,4,'',0
-'2660',200,81500,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2660',201,92500,4,'',0,32500,4,'',0,10500,4,'',0,36000,4,'',0,11500,4,'',0,30000,4,'',0,19300,4,'',0
-'2661',200,94000,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
-'2661',201,94000,4,'',0,77200,4,'',0,19400,4,'',0
-'2655',2001,103600,4,'',0,10500,4,'',0,10900,4,'',0,20000,4,'',0,18000,4,'',0,9000,4,'',0
-'2660',2001,81500,4,'',0,22500,4,'',0,11000,4,'',0,35000,4,'',0,11500,4,'',0,33500,4,'',0
-'2661',2001,131500,4,'',0,20000,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111291 b/src/main/res-next/raw/next_gtfs_schedule_stop_111291
deleted file mode 100644
index fd6d977f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111291
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232400,,'',0
-'2655',200,62700,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,81600,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94100,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111292 b/src/main/res-next/raw/next_gtfs_schedule_stop_111292
deleted file mode 100644
index 2b2b0ff0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111292
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232500,,'',0
-'2655',200,62800,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,81700,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94200,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111293 b/src/main/res-next/raw/next_gtfs_schedule_stop_111293
deleted file mode 100644
index c9ad80df..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111293
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232600,,'',0
-'2655',200,62900,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94300,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111294 b/src/main/res-next/raw/next_gtfs_schedule_stop_111294
deleted file mode 100644
index 4a956c0b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111294
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232800,,'',0
-'2655',200,63100,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111295 b/src/main/res-next/raw/next_gtfs_schedule_stop_111295
deleted file mode 100644
index bb7084f4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111295
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232900,,'',0
-'2655',200,63200,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,82100,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94600,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111296 b/src/main/res-next/raw/next_gtfs_schedule_stop_111296
deleted file mode 100644
index 2b70b062..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111296
+++ /dev/null
@@ -1,16 +0,0 @@
-'2089',100,171900,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171900,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,74700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92600,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'2660',500,152400,0,'Vanier',0
-'2655',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1100,65600,,'',0,27000,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'2660',1100,92600,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37100,,'',0
-'2655',1200,60700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,113800,,'',0,59900,,'',0
-'2657',1301,93900,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,80000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111297 b/src/main/res-next/raw/next_gtfs_schedule_stop_111297
deleted file mode 100644
index 3cb44cd0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111297
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',100,172000,,'',0,23500,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,63200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,172000,,'',0,23500,,'',0,16000,,'',0,10500,,'',0
-'2660',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',601,62200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1100,65700,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'2660',1100,92600,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
-'2657',1301,93900,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,80100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111298 b/src/main/res-next/raw/next_gtfs_schedule_stop_111298
deleted file mode 100644
index ab7288cc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111298
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',100,172000,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,63300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,172000,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,74800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92700,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',601,62300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1100,65800,,'',0,26900,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40200,,'',0,37100,,'',0
-'2660',1100,92700,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
-'2657',1301,94000,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,80100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111299 b/src/main/res-next/raw/next_gtfs_schedule_stop_111299
deleted file mode 100644
index 6956ee36..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111299
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',601,63700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,101700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1201,72200,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2657',1301,94400,,'',0,21400,,'',0,48600,,'',0
-'2655',9901,160500,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111300 b/src/main/res-next/raw/next_gtfs_schedule_stop_111300
deleted file mode 100644
index d0d7ad4d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111300
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,152500,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,152500,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75500,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111301 b/src/main/res-next/raw/next_gtfs_schedule_stop_111301
deleted file mode 100644
index 9f36e702..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111301
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,152700,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,152700,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93500,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',9901,154700,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111302 b/src/main/res-next/raw/next_gtfs_schedule_stop_111302
deleted file mode 100644
index 37a0fc21..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111302
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,152800,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,152800,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',9901,154800,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111303 b/src/main/res-next/raw/next_gtfs_schedule_stop_111303
deleted file mode 100644
index a2c4b771..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111303
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,152900,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64200,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,152900,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75800,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93700,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',9901,154900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111304 b/src/main/res-next/raw/next_gtfs_schedule_stop_111304
deleted file mode 100644
index d44bbc6f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111304
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,153000,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153000,,'',0,20100,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75900,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93800,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',9901,155000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111305 b/src/main/res-next/raw/next_gtfs_schedule_stop_111305
deleted file mode 100644
index 3765bab9..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111305
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,153100,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64300,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153100,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80000,,'',0,5900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93900,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,5900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111306 b/src/main/res-next/raw/next_gtfs_schedule_stop_111306
deleted file mode 100644
index 4f94e8ae..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111306
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,153200,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64400,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153200,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80100,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,94000,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111322 b/src/main/res-next/raw/next_gtfs_schedule_stop_111322
deleted file mode 100644
index 60d32f93..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111322
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',301,161000,,'',0,19800,,'',0
-'2655',301,83900,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,161000,,'',0,19800,,'',0
-'2660',301,83500,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,90400,,'',0,15500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
-'2658',1501,90200,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111323 b/src/main/res-next/raw/next_gtfs_schedule_stop_111323
deleted file mode 100644
index 3d9b5d09..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111323
+++ /dev/null
@@ -1,13 +0,0 @@
-'2089',101,162500,,'',0,28600,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55000,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,11800,,'',0
-'2656',101,162500,,'',0,28600,,'',0,12000,,'',0,10500,,'',0
-'2660',101,72100,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
-'2089',301,161100,4,'',0,19800,4,'',0
-'2655',301,84000,4,'',0,11400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,15500,4,'',0,4000,4,'',0,16000,4,'',0,22200,4,'',0
-'2656',301,161100,4,'',0,19800,4,'',0
-'2660',301,83600,4,'',0,11700,4,'',0,15600,4,'',0,11400,4,'',0,11600,4,'',0,10000,4,'',0,10000,4,'',0,16900,4,'',0,11000,4,'',0,10600,4,'',0
-'2661',301,90500,4,'',0,19500,4,'',0,10000,4,'',0,14500,4,'',0,10500,4,'',0,18500,4,'',0,10000,4,'',0,10000,4,'',0
-'2655',401,85000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
-'2660',401,84500,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
-'2661',401,91000,,'',0,31500,,'',0,29100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111324 b/src/main/res-next/raw/next_gtfs_schedule_stop_111324
deleted file mode 100644
index d75201ab..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111324
+++ /dev/null
@@ -1,9 +0,0 @@
-'2089',101,162600,,'',0,28600,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1500,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,11800,,'',0
-'2656',101,162600,,'',0,28600,,'',0,12000,,'',0,10500,,'',0
-'2660',101,72200,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
-'2655',401,85100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
-'2660',401,84600,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
-'2661',401,91100,,'',0,31500,,'',0,29100,,'',0
-'2658',1501,90300,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111325 b/src/main/res-next/raw/next_gtfs_schedule_stop_111325
deleted file mode 100644
index 9d76eb94..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111325
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',101,162700,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55100,,'',0,6900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,162700,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72200,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,3900,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111326 b/src/main/res-next/raw/next_gtfs_schedule_stop_111326
deleted file mode 100644
index b2645851..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111326
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',101,162800,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55200,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1500,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,162800,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72300,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111327 b/src/main/res-next/raw/next_gtfs_schedule_stop_111327
deleted file mode 100644
index 5eb22b7b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111327
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160100,,'',0,15800,,'',0
-'2655',301,83000,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160100,,'',0,15800,,'',0
-'2660',301,82600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111328 b/src/main/res-next/raw/next_gtfs_schedule_stop_111328
deleted file mode 100644
index 0521eb2e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111328
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160200,,'',0,19800,,'',0
-'2655',301,83100,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160200,,'',0,19800,,'',0
-'2660',301,82700,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111329 b/src/main/res-next/raw/next_gtfs_schedule_stop_111329
deleted file mode 100644
index c78077cf..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111329
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160300,,'',0,19800,,'',0
-'2655',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160300,,'',0,19800,,'',0
-'2660',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,85700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111330 b/src/main/res-next/raw/next_gtfs_schedule_stop_111330
deleted file mode 100644
index dc2e17b8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111330
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160300,,'',0,19800,,'',0
-'2655',301,83200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160300,,'',0,19800,,'',0
-'2660',301,82800,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,85800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111331 b/src/main/res-next/raw/next_gtfs_schedule_stop_111331
deleted file mode 100644
index 8de87a36..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111331
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,160400,,'',0,19800,,'',0
-'2655',301,83300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,15500,,'',0,4000,,'',0,16000,,'',0,22200,,'',0
-'2656',301,160400,,'',0,19800,,'',0
-'2660',301,82900,,'',0,11700,,'',0,15600,,'',0,11400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,16900,,'',0,11000,,'',0,10600,,'',0
-'2661',301,85900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111332 b/src/main/res-next/raw/next_gtfs_schedule_stop_111332
deleted file mode 100644
index d49c739f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111332
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',401,85300,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10600,,'',0
-'2660',401,84800,,'',0,16000,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10300,,'',0
-'2661',401,91300,,'',0,31500,,'',0,29100,,'',0
-'2658',1501,90500,,'',0,4000,,'',0,8000,,'',0,28000,,'',0,4000,,'',0,8000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111333 b/src/main/res-next/raw/next_gtfs_schedule_stop_111333
deleted file mode 100644
index 56c014e8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111333
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',401,85500,,'',0,10000,,'',0,14600,,'',0,10000,,'',0,10700,,'',0,10000,,'',0,14900,,'',0,15800,,'',0,10500,,'',0
-'2660',401,85000,,'',0,16100,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10200,,'',0
-'2661',401,91500,,'',0,31500,,'',0,29200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111336 b/src/main/res-next/raw/next_gtfs_schedule_stop_111336
deleted file mode 100644
index e1442ff6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111336
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',401,90000,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10800,,'',0,10000,,'',0,19000,,'',0,11600,,'',0,10400,,'',0
-'2660',401,85500,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,11000,,'',0,10000,,'',0,17200,,'',0,10400,,'',0,10100,,'',0
-'2661',401,92100,,'',0,31500,,'',0,29200,,'',0
-'2655',1001,70400,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1001,91800,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111337 b/src/main/res-next/raw/next_gtfs_schedule_stop_111337
deleted file mode 100644
index 677d2744..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111337
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124100,,'',0,29200,,'',0,38300,,'',0
-'2655',500,80900,0,'Vanier',0,3000,0,'Vanier',0
-'2655',1000,80400,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,102800,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111340 b/src/main/res-next/raw/next_gtfs_schedule_stop_111340
deleted file mode 100644
index cf189190..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111340
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',400,81000,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90700,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124800,,'',0,29200,,'',0,38300,,'',0
-'2658',1500,93400,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111347 b/src/main/res-next/raw/next_gtfs_schedule_stop_111347
deleted file mode 100644
index e6c35879..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111347
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64500,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80200,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,5800,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111348 b/src/main/res-next/raw/next_gtfs_schedule_stop_111348
deleted file mode 100644
index 84d5931c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111348
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64600,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11400,,'',0
-'2656',100,153400,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80300,,'',0,9900,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,94200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111349 b/src/main/res-next/raw/next_gtfs_schedule_stop_111349
deleted file mode 100644
index 53f6c30a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111349
+++ /dev/null
@@ -1,9 +0,0 @@
-'2089',100,153600,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64700,,'',0,7000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,8300,,'',0,2600,,'',0,7500,,'',0,3500,,'',0,11400,,'',0
-'2656',100,153600,,'',0,20100,,'',0,27300,,'',0,12000,,'',0,10500,,'',0
-'2660',100,80400,,'',0,9900,,'',0,4100,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8100,,'',0,8100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7900,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,94400,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,5000,,'',0,9900,,'',0
-'2655',400,81300,,'',0,10300,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11400,,'',0,16400,,'',0
-'2660',400,91100,,'',0,12200,,'',0,11500,,'',0,15600,,'',0,11000,,'',0,10000,,'',0,10300,,'',0,12200,,'',0,16100,,'',0
-'2661',400,125200,,'',0,29200,,'',0,38200,,'',0
-'2658',1500,93600,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111352 b/src/main/res-next/raw/next_gtfs_schedule_stop_111352
deleted file mode 100644
index b49cbafe..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111352
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,154800,,'',0,19800,,'',0
-'2655',301,73400,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,154800,,'',0,19800,,'',0
-'2660',301,81300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111353 b/src/main/res-next/raw/next_gtfs_schedule_stop_111353
deleted file mode 100644
index 8498134b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111353
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,154900,,'',0,19800,,'',0
-'2655',301,73500,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,154900,,'',0,19800,,'',0
-'2660',301,81400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111355 b/src/main/res-next/raw/next_gtfs_schedule_stop_111355
deleted file mode 100644
index 36ae9be7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111355
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155100,,'',0,19800,,'',0
-'2655',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155100,,'',0,19800,,'',0
-'2660',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111356 b/src/main/res-next/raw/next_gtfs_schedule_stop_111356
deleted file mode 100644
index 36ae9be7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111356
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155100,,'',0,19800,,'',0
-'2655',301,73700,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155100,,'',0,19800,,'',0
-'2660',301,81600,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84600,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111357 b/src/main/res-next/raw/next_gtfs_schedule_stop_111357
deleted file mode 100644
index 0caf8dc5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111357
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155200,,'',0,19800,,'',0
-'2655',301,73800,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155200,,'',0,19800,,'',0
-'2660',301,81700,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,11000,,'',0,14600,,'',0
-'2661',301,84700,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111358 b/src/main/res-next/raw/next_gtfs_schedule_stop_111358
deleted file mode 100644
index 99905588..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111358
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155300,,'',0,19800,,'',0
-'2655',301,73900,,'',0,8300,,'',0,600,0,'Isfeld S',0,10800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155300,,'',0,19800,,'',0
-'2660',301,81800,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,84800,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111359 b/src/main/res-next/raw/next_gtfs_schedule_stop_111359
deleted file mode 100644
index 02fe7ef5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111359
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155400,,'',0,19800,,'',0
-'2655',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155400,,'',0,19800,,'',0
-'2660',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111360 b/src/main/res-next/raw/next_gtfs_schedule_stop_111360
deleted file mode 100644
index 02fe7ef5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111360
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155400,,'',0,19800,,'',0
-'2655',301,74000,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155400,,'',0,19800,,'',0
-'2660',301,81900,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,84900,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111361 b/src/main/res-next/raw/next_gtfs_schedule_stop_111361
deleted file mode 100644
index e29fffc4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111361
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155500,,'',0,19800,,'',0
-'2655',301,74100,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155500,,'',0,19800,,'',0
-'2660',301,82000,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85000,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111362 b/src/main/res-next/raw/next_gtfs_schedule_stop_111362
deleted file mode 100644
index 2fd234bc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111362
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155600,,'',0,19800,,'',0
-'2655',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155600,,'',0,19800,,'',0
-'2660',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111363 b/src/main/res-next/raw/next_gtfs_schedule_stop_111363
deleted file mode 100644
index 2fd234bc..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111363
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155600,,'',0,19800,,'',0
-'2655',301,74200,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155600,,'',0,19800,,'',0
-'2660',301,82100,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85100,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111364 b/src/main/res-next/raw/next_gtfs_schedule_stop_111364
deleted file mode 100644
index ebcab508..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111364
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155700,,'',0,19800,,'',0
-'2655',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155700,,'',0,19800,,'',0
-'2660',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111365 b/src/main/res-next/raw/next_gtfs_schedule_stop_111365
deleted file mode 100644
index ebcab508..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111365
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155700,,'',0,19800,,'',0
-'2655',301,74300,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155700,,'',0,19800,,'',0
-'2660',301,82200,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85200,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111366 b/src/main/res-next/raw/next_gtfs_schedule_stop_111366
deleted file mode 100644
index 5f46e036..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111366
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',301,155800,,'',0,19800,,'',0
-'2655',301,74400,,'',0,8300,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155800,,'',0,19800,,'',0
-'2660',301,82300,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85300,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111367 b/src/main/res-next/raw/next_gtfs_schedule_stop_111367
deleted file mode 100644
index bc8c9501..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111367
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',101,74600,0,'Downtown',0
-'2089',301,155900,,'',0,19800,,'',0
-'2655',301,74600,4,'',0,8200,,'',0,11400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,11500,,'',0,8000,,'',0,12000,,'',0,26200,,'',0
-'2656',301,155900,,'',0,19800,,'',0
-'2660',301,82400,,'',0,11700,,'',0,11600,,'',0,15400,,'',0,11600,,'',0,10000,,'',0,10000,,'',0,12900,,'',0,15000,,'',0,10600,,'',0
-'2661',301,85400,,'',0,19500,,'',0,10000,,'',0,18500,,'',0,10500,,'',0,18500,,'',0,10000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111368 b/src/main/res-next/raw/next_gtfs_schedule_stop_111368
deleted file mode 100644
index 37f90090..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111368
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',101,162900,,'',0,28600,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55300,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1100,0,'Downtown',0,400,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,162900,,'',0,28600,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72400,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,8900,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111369 b/src/main/res-next/raw/next_gtfs_schedule_stop_111369
deleted file mode 100644
index a3b36bd9..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111369
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',101,163000,,'',0,28500,,'',0,12000,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11800,,'',0
-'2656',101,163000,,'',0,28500,,'',0,12000,,'',0,10500,,'',0
-'2660',101,72500,,'',0,7900,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,4000,,'',0,6900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111370 b/src/main/res-next/raw/next_gtfs_schedule_stop_111370
deleted file mode 100644
index 6deb78fd..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111370
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163100,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,163100,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72500,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,10000,,'',0
-'2655',301,83300,0,'Isfeld S',0
-'2655',9900,81900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111371 b/src/main/res-next/raw/next_gtfs_schedule_stop_111371
deleted file mode 100644
index 60de2a32..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111371
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163200,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55400,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
-'2656',101,163200,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
-'2660',101,72500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
-'2655',301,83400,0,'Isfeld S',0
-'2655',9900,82000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111372 b/src/main/res-next/raw/next_gtfs_schedule_stop_111372
deleted file mode 100644
index e895957c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111372
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163300,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,163300,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72700,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
-'2655',301,83700,0,'Isfeld S',0
-'2655',9900,82300,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111373 b/src/main/res-next/raw/next_gtfs_schedule_stop_111373
deleted file mode 100644
index 60a9811f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111373
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',100,152700,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,64000,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6600,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,152700,,'',0,20200,,'',0,27400,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75700,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93600,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,9000,,'',0,10000,,'',0
-'2655',9901,154800,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111374 b/src/main/res-next/raw/next_gtfs_schedule_stop_111374
deleted file mode 100644
index 145e4f93..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111374
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163400,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55600,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6100,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
-'2656',101,163400,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
-'2660',101,72700,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,7900,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,8900,,'',0,9900,,'',0
-'2655',301,83800,0,'Isfeld S',0
-'2655',9900,82300,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111375 b/src/main/res-next/raw/next_gtfs_schedule_stop_111375
deleted file mode 100644
index 77694310..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111375
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163400,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55700,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,163400,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72800,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
-'2655',301,83900,0,'Isfeld S',0
-'2655',9900,82400,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111377 b/src/main/res-next/raw/next_gtfs_schedule_stop_111377
deleted file mode 100644
index 35655651..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111377
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,163600,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,11600,,'',0
-'2656',101,163600,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
-'2660',101,72900,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
-'2655',9900,82700,0,'VMP Connector',0,1900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111378 b/src/main/res-next/raw/next_gtfs_schedule_stop_111378
deleted file mode 100644
index cb7d4b57..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111378
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',101,164300,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,60300,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,1200,0,'Downtown',0,4300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15500,,'',0
-'2656',101,164300,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73500,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,10900,,'',0
-'2661',101,92100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
-'2655',601,64700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'2660',601,84200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
-'2661',601,102700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1101,73500,,'',0,27300,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39900,,'',0,33000,,'',0
-'2660',1101,100900,,'',0,11700,,'',0,39800,,'',0,39900,,'',0,33000,,'',0
-'2655',1201,72600,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2655',9901,160900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111379 b/src/main/res-next/raw/next_gtfs_schedule_stop_111379
deleted file mode 100644
index 2fd455ec..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111379
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',101,164400,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,60400,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
-'2656',101,164400,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,92200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
-'2655',601,64800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'2660',601,84300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
-'2661',601,102800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1101,73500,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'2660',1101,101000,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
-'2655',1201,72700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2655',9901,161000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111380 b/src/main/res-next/raw/next_gtfs_schedule_stop_111380
deleted file mode 100644
index 863cbfc1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111380
+++ /dev/null
@@ -1,17 +0,0 @@
-'2089',101,164500,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60500,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5200,0,'Downtown',0,300,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
-'2656',101,164500,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73600,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
-'2655',501,82300,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'2660',501,153500,0,'Vanier',0
-'2655',601,64900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'2660',601,84400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
-'2661',601,102900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1101,73600,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'2660',1101,101000,,'',0,11800,,'',0,39700,,'',0,39900,,'',0,33000,,'',0
-'2655',1201,72700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,125600,,'',0,60000,,'',0
-'2657',1301,102600,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,85900,0,'VMP Connector',0
-'2655',9901,161000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111381 b/src/main/res-next/raw/next_gtfs_schedule_stop_111381
deleted file mode 100644
index 43d1e5b8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111381
+++ /dev/null
@@ -1,16 +0,0 @@
-'2089',100,171800,,'',0,23600,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,63100,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,171800,,'',0,23600,,'',0,16000,,'',0,10500,,'',0
-'2660',100,74600,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,92500,,'',0,8500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',500,151700,0,'Vanier',0,10400,0,'Vanier',0
-'2660',500,152400,0,'Vanier',0
-'2655',601,62100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1100,65600,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
-'2660',1100,92500,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
-'2655',1200,60700,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,113800,,'',0,59900,,'',0
-'2657',1301,93800,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,80000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111382 b/src/main/res-next/raw/next_gtfs_schedule_stop_111382
deleted file mode 100644
index c063aa52..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111382
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1001,70200,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1001,91600,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111383 b/src/main/res-next/raw/next_gtfs_schedule_stop_111383
deleted file mode 100644
index 1d375d1e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111383
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1000,80500,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2660',1000,102900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111384 b/src/main/res-next/raw/next_gtfs_schedule_stop_111384
deleted file mode 100644
index ef8e48a6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111384
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2655',9900,83300,0,'VMP Connector',0
-'2655',9901,153300,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111385 b/src/main/res-next/raw/next_gtfs_schedule_stop_111385
deleted file mode 100644
index f8810e54..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111385
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83500,0,'VMP Connector',0
-'2655',9901,153500,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111386 b/src/main/res-next/raw/next_gtfs_schedule_stop_111386
deleted file mode 100644
index f1c3a9b1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111386
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83600,0,'VMP Connector',0
-'2655',9901,153600,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111387 b/src/main/res-next/raw/next_gtfs_schedule_stop_111387
deleted file mode 100644
index 0e635a4a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111387
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62700,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82200,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100700,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83600,0,'VMP Connector',0
-'2655',9901,153700,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111388 b/src/main/res-next/raw/next_gtfs_schedule_stop_111388
deleted file mode 100644
index c09da104..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111388
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83800,0,'VMP Connector',0
-'2655',9901,153800,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111389 b/src/main/res-next/raw/next_gtfs_schedule_stop_111389
deleted file mode 100644
index c847f1e6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111389
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83900,0,'VMP Connector',0
-'2655',9901,154000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111390 b/src/main/res-next/raw/next_gtfs_schedule_stop_111390
deleted file mode 100644
index f844f92f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111390
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83500,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,82900,0,'VMP Connector',0
-'2655',9901,152900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111391 b/src/main/res-next/raw/next_gtfs_schedule_stop_111391
deleted file mode 100644
index 585e6540..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111391
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,82900,0,'VMP Connector',0
-'2655',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111392 b/src/main/res-next/raw/next_gtfs_schedule_stop_111392
deleted file mode 100644
index 1d608a1c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111392
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64100,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83600,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83000,0,'VMP Connector',0
-'2655',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111393 b/src/main/res-next/raw/next_gtfs_schedule_stop_111393
deleted file mode 100644
index eaadda5d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111393
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83000,0,'VMP Connector',0
-'2655',9901,153000,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111394 b/src/main/res-next/raw/next_gtfs_schedule_stop_111394
deleted file mode 100644
index e75a8b8e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111394
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83000,0,'VMP Connector',0
-'2655',9901,153100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111395 b/src/main/res-next/raw/next_gtfs_schedule_stop_111395
deleted file mode 100644
index 92557062..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111395
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83200,0,'VMP Connector',0
-'2655',9901,153200,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111396 b/src/main/res-next/raw/next_gtfs_schedule_stop_111396
deleted file mode 100644
index 5c6a8f27..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111396
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'2660',601,84000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
-'2661',601,102500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83300,0,'VMP Connector',0
-'2655',9901,153300,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111397 b/src/main/res-next/raw/next_gtfs_schedule_stop_111397
deleted file mode 100644
index b4e04484..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111397
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111398 b/src/main/res-next/raw/next_gtfs_schedule_stop_111398
deleted file mode 100644
index 48c7dcf9..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111398
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,65700,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,84900,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111399 b/src/main/res-next/raw/next_gtfs_schedule_stop_111399
deleted file mode 100644
index db813d4e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111399
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,65800,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85000,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111400 b/src/main/res-next/raw/next_gtfs_schedule_stop_111400
deleted file mode 100644
index 81ed8091..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111400
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111401 b/src/main/res-next/raw/next_gtfs_schedule_stop_111401
deleted file mode 100644
index 81ed8091..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111401
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,65900,0,'Arden',0,8900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85100,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111402 b/src/main/res-next/raw/next_gtfs_schedule_stop_111402
deleted file mode 100644
index 33538573..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111402
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111404 b/src/main/res-next/raw/next_gtfs_schedule_stop_111404
deleted file mode 100644
index 6f3e7b32..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111404
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,70200,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85500,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111405 b/src/main/res-next/raw/next_gtfs_schedule_stop_111405
deleted file mode 100644
index 44be0ee5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111405
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,70200,0,'Arden',0,5100,,'',0,15400,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,12000,,'',0,8200,,'',0,10000,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85600,,'',0,25100,0,'Arden',0,20700,0,'Arden',0,23500,,'',0,16300,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64800,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90200,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104300,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111406 b/src/main/res-next/raw/next_gtfs_schedule_stop_111406
deleted file mode 100644
index b94dd58b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111406
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,75400,,'',0,78900,,'',0,8200,,'',0
-'2660',701,85700,,'',0,69300,,'',0
-'2655',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111407 b/src/main/res-next/raw/next_gtfs_schedule_stop_111407
deleted file mode 100644
index d83ed89d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111407
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,75900,,'',0,78900,,'',0,8200,,'',0
-'2660',701,90200,,'',0,65300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111408 b/src/main/res-next/raw/next_gtfs_schedule_stop_111408
deleted file mode 100644
index acd46222..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111408
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80000,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90300,,'',0,65300,,'',0
-'2655',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111409 b/src/main/res-next/raw/next_gtfs_schedule_stop_111409
deleted file mode 100644
index 21f6c9b2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111409
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80000,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90300,,'',0,65300,,'',0
-'2655',801,65400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90800,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111410 b/src/main/res-next/raw/next_gtfs_schedule_stop_111410
deleted file mode 100644
index 719fb0f6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111410
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90400,,'',0,65300,,'',0
-'2655',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111411 b/src/main/res-next/raw/next_gtfs_schedule_stop_111411
deleted file mode 100644
index 719fb0f6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111411
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90400,,'',0,65300,,'',0
-'2655',801,65500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90900,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111412 b/src/main/res-next/raw/next_gtfs_schedule_stop_111412
deleted file mode 100644
index 0eceaa34..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111412
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62600,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83500,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94200,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111413 b/src/main/res-next/raw/next_gtfs_schedule_stop_111413
deleted file mode 100644
index a79c625d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111413
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80100,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90400,,'',0,65300,,'',0
-'2655',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111414 b/src/main/res-next/raw/next_gtfs_schedule_stop_111414
deleted file mode 100644
index 384db9e6..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111414
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,80200,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90500,,'',0,65300,,'',0
-'2655',801,65600,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,91000,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105100,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111415 b/src/main/res-next/raw/next_gtfs_schedule_stop_111415
deleted file mode 100644
index ea22ceba..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111415
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,64400,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,85800,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,103900,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111416 b/src/main/res-next/raw/next_gtfs_schedule_stop_111416
deleted file mode 100644
index f9812bd8..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111416
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111417 b/src/main/res-next/raw/next_gtfs_schedule_stop_111417
deleted file mode 100644
index e909a44f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111417
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
-'2660',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111418 b/src/main/res-next/raw/next_gtfs_schedule_stop_111418
deleted file mode 100644
index 9d4ca60d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111418
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,64900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111419 b/src/main/res-next/raw/next_gtfs_schedule_stop_111419
deleted file mode 100644
index e6aed74e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111419
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,65000,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90400,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104500,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111420 b/src/main/res-next/raw/next_gtfs_schedule_stop_111420
deleted file mode 100644
index 8cd567e1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111420
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,65100,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90500,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104600,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111421 b/src/main/res-next/raw/next_gtfs_schedule_stop_111421
deleted file mode 100644
index 1418b19b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111421
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,65200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90600,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111422 b/src/main/res-next/raw/next_gtfs_schedule_stop_111422
deleted file mode 100644
index 3352c258..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111422
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',801,65300,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,90700,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104800,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111423 b/src/main/res-next/raw/next_gtfs_schedule_stop_111423
deleted file mode 100644
index dcadf3fa..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111423
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62500,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83400,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94100,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111424 b/src/main/res-next/raw/next_gtfs_schedule_stop_111424
deleted file mode 100644
index 5458af53..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111424
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111425 b/src/main/res-next/raw/next_gtfs_schedule_stop_111425
deleted file mode 100644
index 5458af53..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111425
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62700,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111426 b/src/main/res-next/raw/next_gtfs_schedule_stop_111426
deleted file mode 100644
index 584eea0f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111426
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62800,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83700,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94400,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111427 b/src/main/res-next/raw/next_gtfs_schedule_stop_111427
deleted file mode 100644
index 82fda630..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111427
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,62900,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83800,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111428 b/src/main/res-next/raw/next_gtfs_schedule_stop_111428
deleted file mode 100644
index bc692a27..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111428
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111429 b/src/main/res-next/raw/next_gtfs_schedule_stop_111429
deleted file mode 100644
index bc692a27..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111429
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63000,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83900,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94600,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111430 b/src/main/res-next/raw/next_gtfs_schedule_stop_111430
deleted file mode 100644
index 852f9a35..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111430
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63100,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
-'2660',800,84000,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94700,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111431 b/src/main/res-next/raw/next_gtfs_schedule_stop_111431
deleted file mode 100644
index e909a44f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111431
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',800,63200,,'',0,11500,,'',0,15500,,'',0,5500,,'',0,14500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,14000,,'',0
-'2660',800,84100,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94800,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111432 b/src/main/res-next/raw/next_gtfs_schedule_stop_111432
deleted file mode 100644
index 01df361a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111432
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,70400,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,110900,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
-'2655',800,63700,,'',0,11500,,'',0,15500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,15500,,'',0,11500,,'',0,18000,,'',0
-'2660',800,84600,,'',0,11000,,'',0,15500,,'',0,11100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,12000,,'',0,18000,,'',0
-'2661',800,95300,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111435 b/src/main/res-next/raw/next_gtfs_schedule_stop_111435
deleted file mode 100644
index b6ad7d67..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111435
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1001,72500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,93900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,105600,,'',0,68200,,'',0
-'2657',1401,85100,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111437 b/src/main/res-next/raw/next_gtfs_schedule_stop_111437
deleted file mode 100644
index 7393ffcd..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111437
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1001,73700,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2660',1001,95100,,'',0,40000,,'',0,40000,,'',0,37600,,'',0
-'2661',1001,110800,,'',0,64200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111438 b/src/main/res-next/raw/next_gtfs_schedule_stop_111438
deleted file mode 100644
index 2090d078..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111438
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',1000,74500,,'',0,7500,,'',0,13900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2655',1001,74000,4,'',0,7500,4,'',0,13900,4,'',0,40000,4,'',0,40000,4,'',0,37600,4,'',0
-'2660',1000,95900,,'',0,40000,,'',0,40000,,'',0,37100,,'',0
-'2660',1001,95400,4,'',0,40000,4,'',0,40000,4,'',0,37600,4,'',0
-'2661',1000,111600,0,'Downtown',0,68400,0,'Downtown',0
-'2661',1001,111100,4,'',0,64200,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111442 b/src/main/res-next/raw/next_gtfs_schedule_stop_111442
deleted file mode 100644
index abaf2986..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111442
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1000,80300,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,101700,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113400,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90600,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111448 b/src/main/res-next/raw/next_gtfs_schedule_stop_111448
deleted file mode 100644
index 1843cc62..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111448
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1100,70300,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
-'2660',1100,93300,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
-'2657',1301,94600,,'',0,25400,,'',0,44600,,'',0
-'2655',9900,80500,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111449 b/src/main/res-next/raw/next_gtfs_schedule_stop_111449
deleted file mode 100644
index 2ce44cd3..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111449
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1100,94000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'2660',1100,94000,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111450 b/src/main/res-next/raw/next_gtfs_schedule_stop_111450
deleted file mode 100644
index bcf07afa..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111450
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1100,71500,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1100,94800,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
-'2655',9900,81100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111451 b/src/main/res-next/raw/next_gtfs_schedule_stop_111451
deleted file mode 100644
index 3cb7fa1f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111451
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1100,71600,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1100,94900,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
-'2655',9900,81200,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111452 b/src/main/res-next/raw/next_gtfs_schedule_stop_111452
deleted file mode 100644
index 0a36b0aa..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111452
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1100,72000,4,'',0,23300,4,'',0,15800,4,'',0,23700,4,'',0,16000,4,'',0,40000,4,'',0,33000,4,'',0
-'2655',1101,72000,,'',0,23300,,'',0,15800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1100,95300,4,'',0,15800,4,'',0,39700,4,'',0,40000,4,'',0,33000,4,'',0
-'2660',1101,95300,,'',0,15800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111455 b/src/main/res-next/raw/next_gtfs_schedule_stop_111455
deleted file mode 100644
index f8810e54..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111455
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83500,0,'VMP Connector',0
-'2655',9901,153500,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111456 b/src/main/res-next/raw/next_gtfs_schedule_stop_111456
deleted file mode 100644
index 116fa5f7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111456
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',601,62400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,81900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2655',9900,83400,0,'VMP Connector',0
-'2655',9901,153400,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111457 b/src/main/res-next/raw/next_gtfs_schedule_stop_111457
deleted file mode 100644
index b767991b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111457
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,70000,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85200,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111459 b/src/main/res-next/raw/next_gtfs_schedule_stop_111459
deleted file mode 100644
index 53daf115..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111459
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',400,80300,,'',0,10200,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,19000,,'',0,11500,,'',0,12400,,'',0
-'2660',400,90000,,'',0,12200,,'',0,11500,,'',0,11600,,'',0,15000,,'',0,10000,,'',0,10300,,'',0,12300,,'',0,12100,,'',0
-'2661',400,124100,,'',0,29200,,'',0,38300,,'',0
-'2655',500,80800,0,'Vanier',0,3000,0,'Vanier',0
-'2655',1000,80300,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,102700,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111461 b/src/main/res-next/raw/next_gtfs_schedule_stop_111461
deleted file mode 100644
index dcf1ae11..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111461
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,75500,,'',0,78900,,'',0,8200,,'',0
-'2660',701,85800,,'',0,69300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111463 b/src/main/res-next/raw/next_gtfs_schedule_stop_111463
deleted file mode 100644
index 860ab8f7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111463
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,64300,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,5500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83800,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,102300,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,83100,0,'VMP Connector',0
-'2655',9901,153100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111464 b/src/main/res-next/raw/next_gtfs_schedule_stop_111464
deleted file mode 100644
index 33538573..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111464
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,70100,0,'Arden',0,4900,,'',0,15600,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11800,,'',0,8200,,'',0,10200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85300,,'',0,25300,0,'Arden',0,20700,0,'Arden',0,23300,,'',0,16500,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111465 b/src/main/res-next/raw/next_gtfs_schedule_stop_111465
deleted file mode 100644
index 0a327106..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111465
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111467 b/src/main/res-next/raw/next_gtfs_schedule_stop_111467
deleted file mode 100644
index d83ed89d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111467
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,75900,,'',0,78900,,'',0,8200,,'',0
-'2660',701,90200,,'',0,65300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111473 b/src/main/res-next/raw/next_gtfs_schedule_stop_111473
deleted file mode 100644
index 22eb262d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111473
+++ /dev/null
@@ -1,6 +0,0 @@
-'2655',601,62500,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2658',1500,92300,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2655',9900,83400,0,'VMP Connector',0
-'2655',9901,153400,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111474 b/src/main/res-next/raw/next_gtfs_schedule_stop_111474
deleted file mode 100644
index 616366b5..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111474
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165100,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60900,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165100,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74200,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83200,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111475 b/src/main/res-next/raw/next_gtfs_schedule_stop_111475
deleted file mode 100644
index 8fe20ac7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111475
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1101,73000,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1101,100300,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
-'2655',9901,160300,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111476 b/src/main/res-next/raw/next_gtfs_schedule_stop_111476
deleted file mode 100644
index 433f282c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111476
+++ /dev/null
@@ -1,13 +0,0 @@
-'2089',100,172500,,'',0,27500,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,63700,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,172500,,'',0,27500,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75300,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93200,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
-'2655',601,63800,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83300,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,101800,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1100,70200,,'',0,23000,,'',0,11700,,'',0,27700,,'',0,12000,,'',0,40100,,'',0,37000,,'',0
-'2660',1100,93200,,'',0,11700,,'',0,39700,,'',0,40100,,'',0,37000,,'',0
-'2657',1301,94500,,'',0,21400,,'',0,48600,,'',0
-'2658',1500,92000,,'',0,8000,,'',0,4000,,'',0,28000,,'',0,8000,,'',0,4000,,'',0
-'2658',1501,91700,4,'',0,4000,4,'',0,8000,4,'',0,28000,4,'',0,4000,4,'',0,8000,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111477 b/src/main/res-next/raw/next_gtfs_schedule_stop_111477
deleted file mode 100644
index 28c60c3e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111477
+++ /dev/null
@@ -1,5 +0,0 @@
-'2089',100,172600,,'',0,27500,,'',0,12000,,'',0,10500,,'',0,17500,,'',0
-'2655',100,63800,,'',0,7000,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,6500,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,4300,,'',0,6700,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,172600,,'',0,27500,,'',0,12000,,'',0,10500,,'',0
-'2660',100,75400,,'',0,9900,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,17500,,'',0
-'2661',100,93300,,'',0,8500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,5000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111478 b/src/main/res-next/raw/next_gtfs_schedule_stop_111478
deleted file mode 100644
index 257b2f61..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111478
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,163500,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55800,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,163500,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72900,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
-'2655',9900,82600,0,'VMP Connector',0,1900,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111479 b/src/main/res-next/raw/next_gtfs_schedule_stop_111479
deleted file mode 100644
index 2433bb48..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111479
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',301,84100,4,'',0
-'2655',9900,82600,0,'VMP Connector',0,1800,0,'VMP Connector',0
-'2655',9901,154600,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111480 b/src/main/res-next/raw/next_gtfs_schedule_stop_111480
deleted file mode 100644
index 696e0119..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111480
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',601,63400,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82900,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,101400,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111481 b/src/main/res-next/raw/next_gtfs_schedule_stop_111481
deleted file mode 100644
index 552152cf..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111481
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',601,62900,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82400,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,100900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',9900,84000,0,'VMP Connector',0
-'2655',9901,154200,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111483 b/src/main/res-next/raw/next_gtfs_schedule_stop_111483
deleted file mode 100644
index cc70ad31..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111483
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1000,75600,,'',0,5000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,102000,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2661',1000,113700,0,'Downtown',0,68400,0,'Downtown',0
-'2657',1400,90900,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111486 b/src/main/res-next/raw/next_gtfs_schedule_stop_111486
deleted file mode 100644
index 11d8ca7f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111486
+++ /dev/null
@@ -1,33 +0,0 @@
-'2655',101,80300,4,'',0
-'2655',500,151600,0,'Vanier',0,10400,0,'Vanier',0
-'2655',501,82600,4,'',0,3000,4,'',0,67500,4,'',0,200,4,'',0,10200,4,'',0
-'2660',500,152300,0,'Vanier',0
-'2660',501,153800,4,'',0
-'2655',601,62000,,'',0,3200,4,'',0,5800,,'',0,3200,4,'',0,7500,,'',0,3200,4,'',0,7100,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,7300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
-'2660',601,81500,,'',0,3200,4,'',0,7300,,'',0,3200,4,'',0,6800,,'',0,3200,4,'',0,7800,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,3300,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,2800,,'',0,7200,4,'',0,1800,,'',0,7200,4,'',0,1800,,'',0,3200,4,'',0
-'2661',601,100000,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0,16800,,'',0,3200,4,'',0
-'2655',701,65500,0,'Arden',0,5200,4,'',0,3700,,'',0,15600,0,'Arden',0,1200,4,'',0,10300,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,9300,0,'Arden',0,1200,4,'',0,18300,0,'Arden',0,1200,4,'',0,10600,,'',0,8200,,'',0,10200,0,'Arden',0,1200,4,'',0,8800,0,'Arden',0,1200,4,'',0,20600,0,'Arden',0,1200,4,'',0
-'2660',701,84700,,'',0,25300,0,'Arden',0,1200,4,'',0,19500,0,'Arden',0,1200,4,'',0,22100,,'',0,16500,0,'Arden',0,1200,4,'',0,31800,0,'Arden',0,1200,4,'',0
-'2655',800,63900,4,'',0,11500,4,'',0,15500,4,'',0,9500,4,'',0,10500,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9400,4,'',0,3600,4,'',0,15500,4,'',0,11500,4,'',0,18000,4,'',0
-'2655',801,64200,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',800,84800,4,'',0,11000,4,'',0,15500,4,'',0,11100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,11500,4,'',0,9900,4,'',0,15500,4,'',0,12000,4,'',0,18000,4,'',0
-'2660',801,85600,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',800,95500,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0,27500,4,'',0
-'2661',801,103700,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
-'2655',1000,81100,4,'',0,1000,4,'',0,3500,4,'',0,17900,4,'',0,40000,4,'',0,40000,4,'',0,37100,4,'',0
-'2655',1001,70000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1000,103500,4,'',0,40000,4,'',0,40000,4,'',0,37100,4,'',0
-'2660',1001,91400,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2655',1100,65500,,'',0,26900,,'',0,11700,,'',0,27600,,'',0,12000,,'',0,40300,,'',0,37100,,'',0
-'2655',1101,73800,4,'',0,27400,4,'',0,11800,4,'',0,27900,4,'',0,12000,4,'',0,39700,4,'',0,33000,4,'',0
-'2660',1100,92400,,'',0,11700,,'',0,39700,,'',0,40200,,'',0,37100,,'',0
-'2660',1101,101300,4,'',0,11700,4,'',0,39800,4,'',0,39800,4,'',0,33000,4,'',0
-'2655',1200,60600,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2655',1201,73000,4,'',0,17000,4,'',0,40200,4,'',0,19800,4,'',0,30000,4,'',0,10200,4,'',0
-'2660',1200,113700,,'',0,59900,,'',0
-'2660',1201,125900,4,'',0,60000,4,'',0
-'2657',1301,93700,,'',0,9200,4,'',0,12200,,'',0,9200,4,'',0,39400,,'',0,9200,4,'',0
-'2657',1400,92400,4,'',0,21400,4,'',0,48700,4,'',0
-'2657',1401,83000,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,75900,0,'VMP Connector',0,14300,4,'',0
-'2655',9901,161300,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111488 b/src/main/res-next/raw/next_gtfs_schedule_stop_111488
deleted file mode 100644
index 3c85546f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111488
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,164900,,'',0,28200,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60800,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15500,,'',0
-'2656',101,164900,,'',0,28200,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,5800,,'',0
-'2657',1401,83100,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111489 b/src/main/res-next/raw/next_gtfs_schedule_stop_111489
deleted file mode 100644
index 1ecc0d30..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111489
+++ /dev/null
@@ -1,17 +0,0 @@
-'2089',101,164600,,'',0,28300,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,60600,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,5300,0,'Downtown',0,200,,'',0,2400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,15600,,'',0
-'2656',101,164600,,'',0,28300,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,14900,,'',0
-'2661',101,92400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,4900,,'',0,9800,,'',0
-'2655',501,82500,0,'Vanier',0,3000,0,'Vanier',0,67500,0,'Vanier',0,200,0,'Vanier',0,10200,0,'Vanier',0
-'2660',501,153700,0,'Vanier',0
-'2655',601,65000,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,5000,,'',0
-'2660',601,84500,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0
-'2661',601,103000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1101,73700,,'',0,27400,,'',0,11800,,'',0,27800,,'',0,12000,,'',0,39800,,'',0,33000,,'',0
-'2660',1101,101200,,'',0,11700,,'',0,39800,,'',0,39800,,'',0,33000,,'',0
-'2655',1201,72900,,'',0,13000,,'',0,44200,,'',0,15800,,'',0,30000,,'',0,14200,,'',0
-'2660',1201,125800,,'',0,60000,,'',0
-'2657',1301,102800,,'',0,21400,,'',0,48600,,'',0
-'2655',9900,90100,0,'VMP Connector',0
-'2655',9901,161200,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111490 b/src/main/res-next/raw/next_gtfs_schedule_stop_111490
deleted file mode 100644
index 5f6024c4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111490
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1001,70300,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1001,91700,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111491 b/src/main/res-next/raw/next_gtfs_schedule_stop_111491
deleted file mode 100644
index 0a327106..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111491
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',701,70100,0,'Arden',0,5000,,'',0,15500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,11900,,'',0,8200,,'',0,10100,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,85400,,'',0,25200,0,'Arden',0,20700,0,'Arden',0,23400,,'',0,16400,0,'Arden',0,33000,0,'Arden',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111492 b/src/main/res-next/raw/next_gtfs_schedule_stop_111492
deleted file mode 100644
index 2901bfa0..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111492
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1200,61200,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,114300,,'',0,59900,,'',0
-'2655',9901,152600,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111499 b/src/main/res-next/raw/next_gtfs_schedule_stop_111499
deleted file mode 100644
index 41096c4e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111499
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',401,90100,,'',0,10100,,'',0,10600,,'',0,10000,,'',0,10700,,'',0,10100,,'',0,19000,,'',0,11600,,'',0,10400,,'',0
-'2660',401,85600,,'',0,16200,,'',0,11500,,'',0,11600,,'',0,10900,,'',0,10000,,'',0,17200,,'',0,10500,,'',0,10100,,'',0
-'2661',401,92200,,'',0,31500,,'',0,29200,,'',0
-'2655',1001,70500,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
-'2660',1001,91900,,'',0,40000,,'',0,40000,,'',0,33600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111500 b/src/main/res-next/raw/next_gtfs_schedule_stop_111500
deleted file mode 100644
index a4bdd0d4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111500
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232700,,'',0
-'2655',200,63000,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,81900,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94400,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111501 b/src/main/res-next/raw/next_gtfs_schedule_stop_111501
deleted file mode 100644
index c9ad80df..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111501
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232600,,'',0
-'2655',200,62900,,'',0,8500,,'',0,2900,0,'Comox Mall',0,9600,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,81800,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94300,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111502 b/src/main/res-next/raw/next_gtfs_schedule_stop_111502
deleted file mode 100644
index e6b551ca..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111502
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',200,232800,,'',0
-'2655',200,63100,,'',0,8500,,'',0,3000,0,'Comox Mall',0,9500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8000,,'',0,9000,,'',0,11500,,'',0,11500,,'',0,18000,,'',0
-'2660',200,82000,,'',0,11000,,'',0,11500,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,12000,,'',0,18000,,'',0,19300,,'',0
-'2661',200,94500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111503 b/src/main/res-next/raw/next_gtfs_schedule_stop_111503
deleted file mode 100644
index 6b794420..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111503
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',201,232100,,'',0
-'2655',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,93800,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111504 b/src/main/res-next/raw/next_gtfs_schedule_stop_111504
deleted file mode 100644
index 0343a7c2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111504
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',201,232200,,'',0
-'2655',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,93900,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111505 b/src/main/res-next/raw/next_gtfs_schedule_stop_111505
deleted file mode 100644
index 0343a7c2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111505
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',201,232200,,'',0
-'2655',201,62500,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,92400,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,93900,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111506 b/src/main/res-next/raw/next_gtfs_schedule_stop_111506
deleted file mode 100644
index 8e40bba7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111506
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',2001,103400,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,18000,,'',0,9000,,'',0
-'2660',2001,81300,,'',0,22500,,'',0,11000,,'',0,31000,,'',0,15500,,'',0,33500,,'',0
-'2661',2001,131300,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_111507 b/src/main/res-next/raw/next_gtfs_schedule_stop_111507
deleted file mode 100644
index 6b794420..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_111507
+++ /dev/null
@@ -1,4 +0,0 @@
-'2089',201,232100,,'',0
-'2655',201,62400,,'',0,8500,,'',0,2900,,'',0,9600,,'',0,9500,,'',0,41900,,'',0,20000,,'',0,28500,,'',0,11500,,'',0,18000,,'',0
-'2660',201,92300,,'',0,32500,,'',0,10500,,'',0,36000,,'',0,11500,,'',0,30000,,'',0,19300,,'',0
-'2661',201,93800,,'',0,77200,,'',0,19400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_112064 b/src/main/res-next/raw/next_gtfs_schedule_stop_112064
deleted file mode 100644
index 9564d56e..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_112064
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,64700,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,121900,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134002 b/src/main/res-next/raw/next_gtfs_schedule_stop_134002
deleted file mode 100644
index 5a2d630a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134002
+++ /dev/null
@@ -1,6 +0,0 @@
-'2089',101,165200,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,61000,,'',0,2900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165200,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74300,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,93000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2657',1401,83300,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134003 b/src/main/res-next/raw/next_gtfs_schedule_stop_134003
deleted file mode 100644
index c2f42aec..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134003
+++ /dev/null
@@ -1,5 +0,0 @@
-'2655',701,70300,0,'Arden',0,20500,0,'Arden',0,11500,0,'Arden',0,10000,0,'Arden',0,10500,0,'Arden',0,19500,0,'Arden',0,30200,0,'Arden',0,10000,0,'Arden',0,21800,0,'Arden',0
-'2660',701,110800,0,'Arden',0,20700,0,'Arden',0,39800,0,'Arden',0,33000,0,'Arden',0
-'2655',801,64500,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,85900,,'',0,14800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,10700,,'',0,15500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,104000,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134004 b/src/main/res-next/raw/next_gtfs_schedule_stop_134004
deleted file mode 100644
index f7ee3b3c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134004
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',101,165500,,'',0,28100,,'',0,11800,,'',0,10500,,'',0,14900,,'',0
-'2655',101,61300,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1700,,'',0,5500,,'',0,2500,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,15500,,'',0
-'2656',101,165500,,'',0,28100,,'',0,11800,,'',0,10500,,'',0
-'2660',101,74600,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,3900,,'',0,10500,,'',0,14900,,'',0
-'2661',101,93300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2655',701,80200,,'',0,74900,,'',0,8200,,'',0
-'2660',701,90500,,'',0,65300,,'',0
-'2655',801,65700,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,10900,,'',0,16200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,91100,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105200,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
-'2655',1001,74600,,'',0
-'2657',1401,83500,,'',0,100,,'',0,21300,,'',0,100,,'',0,48500,,'',0,100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134005 b/src/main/res-next/raw/next_gtfs_schedule_stop_134005
deleted file mode 100644
index c03d311b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134005
+++ /dev/null
@@ -1,10 +0,0 @@
-'2089',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0,13500,,'',0
-'2655',100,62400,,'',0,3000,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,8300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,11500,,'',0
-'2656',100,170900,,'',0,23800,,'',0,16000,,'',0,10500,,'',0
-'2660',100,83700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4100,,'',0,8000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,10500,,'',0,13500,,'',0
-'2661',100,91700,,'',0,8500,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,10000,,'',0
-'2655',200,75800,0,'Comox Mall',0
-'2655',800,62400,,'',0,11500,,'',0,11500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,3600,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',800,83300,,'',0,11000,,'',0,11500,,'',0,15100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,16000,,'',0,14000,,'',0
-'2661',800,94000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,27500,,'',0
-'2657',1400,91400,,'',0,21400,,'',0,48700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134006 b/src/main/res-next/raw/next_gtfs_schedule_stop_134006
deleted file mode 100644
index 410f0af1..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134006
+++ /dev/null
@@ -1,19 +0,0 @@
-'2089',101,165800,,'',0,28100,,'',0,11800,,'',0,14500,,'',0,10900,,'',0
-'2655',101,61600,,'',0,2900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5700,,'',0,1500,,'',0,2500,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,2000,,'',0,1000,,'',0,1000,,'',0,6000,,'',0,2000,,'',0,8400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,11500,,'',0
-'2656',101,165800,,'',0,28100,,'',0,11800,,'',0,14500,,'',0
-'2660',101,74800,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,14500,,'',0,10900,,'',0
-'2661',101,93500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,8900,,'',0,10000,,'',0,9900,,'',0,9400,,'',0,8900,,'',0,9800,,'',0
-'2089',200,233800,,'',0
-'2655',200,64100,,'',0,8500,,'',0,12500,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,14900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,4000,,'',0,9000,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'2660',200,83000,,'',0,11000,,'',0,11500,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,16000,,'',0,14000,,'',0,19300,,'',0
-'2661',200,95500,,'',0,37500,,'',0,20000,,'',0,19700,,'',0,19400,,'',0
-'2655',801,65900,,'',0,16500,,'',0,9500,,'',0,9800,,'',0,10500,,'',0,10900,,'',0,10700,,'',0,9300,,'',0,12100,,'',0,14900,,'',0,12200,,'',0,11500,,'',0,18000,,'',0
-'2660',801,91300,,'',0,10800,,'',0,11000,,'',0,10700,,'',0,10500,,'',0,9800,,'',0,11500,,'',0,14700,,'',0,11500,,'',0,11300,,'',0,18700,,'',0
-'2661',801,105400,,'',0,20200,,'',0,19700,,'',0,20100,,'',0,20000,,'',0
-'2655',1001,71000,,'',0,3900,,'',0,17500,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2660',1001,92400,,'',0,40000,,'',0,40000,,'',0,33500,,'',0
-'2661',1001,104100,,'',0,68200,,'',0
-'2657',1401,83800,,'',0,21400,,'',0,48600,,'',0
-'2655',2001,102000,,'',0,10500,,'',0,10900,,'',0,20000,,'',0,17700,,'',0,300,,'',0,9000,,'',0
-'2660',2001,75900,,'',0,26500,,'',0,11000,,'',0,31000,,'',0,11500,,'',0,37500,,'',0
-'2661',2001,125900,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134007 b/src/main/res-next/raw/next_gtfs_schedule_stop_134007
deleted file mode 100644
index 47b5ffa4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134007
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1000,80000,,'',0,1000,,'',0,3500,,'',0,17900,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
-'2660',1000,102400,,'',0,40000,,'',0,40000,,'',0,33100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134008 b/src/main/res-next/raw/next_gtfs_schedule_stop_134008
deleted file mode 100644
index 8fb61a3f..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134008
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',301,82900,0,'Isfeld S',0
-'2655',9900,81600,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134009 b/src/main/res-next/raw/next_gtfs_schedule_stop_134009
deleted file mode 100644
index 343e3ca2..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134009
+++ /dev/null
@@ -1 +0,0 @@
-'2655',9901,155200,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134010 b/src/main/res-next/raw/next_gtfs_schedule_stop_134010
deleted file mode 100644
index 31e5eaad..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134010
+++ /dev/null
@@ -1,12 +0,0 @@
-'2089',101,163700,,'',0,28500,,'',0,11800,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55900,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6400,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,8500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,15600,,'',0
-'2656',101,163700,,'',0,28500,,'',0,11800,,'',0,10500,,'',0
-'2660',101,73000,,'',0,8000,,'',0,4000,,'',0,7900,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,8000,,'',0,7900,,'',0,4000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9400,,'',0,4900,,'',0,9900,,'',0
-'2655',601,63600,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,83100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0
-'2661',601,101600,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
-'2655',1101,73100,,'',0,27300,,'',0,11800,,'',0,23700,,'',0,16000,,'',0,40000,,'',0,33000,,'',0
-'2660',1101,100400,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,33000,,'',0
-'2655',1201,72100,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2655',9901,160400,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134011 b/src/main/res-next/raw/next_gtfs_schedule_stop_134011
deleted file mode 100644
index 184a60a4..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134011
+++ /dev/null
@@ -1 +0,0 @@
-'2655',9900,80800,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134012 b/src/main/res-next/raw/next_gtfs_schedule_stop_134012
deleted file mode 100644
index 7dcca0ec..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134012
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1100,70700,,'',0,23000,,'',0,11800,,'',0,27700,,'',0,12000,,'',0,40000,,'',0,37000,,'',0
-'2660',1100,93700,,'',0,11800,,'',0,39700,,'',0,40000,,'',0,37000,,'',0
-'2657',1301,95000,,'',0,25400,,'',0,44600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134013 b/src/main/res-next/raw/next_gtfs_schedule_stop_134013
deleted file mode 100644
index 61e589e9..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134013
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',601,63200,,'',0,9000,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,9000,,'',0
-'2660',601,82700,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0
-'2661',601,101200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134014 b/src/main/res-next/raw/next_gtfs_schedule_stop_134014
deleted file mode 100644
index 120edb0d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134014
+++ /dev/null
@@ -1,7 +0,0 @@
-'2089',101,163200,,'',0,28500,,'',0,11900,,'',0,10500,,'',0,10900,,'',0
-'2655',101,55500,,'',0,6900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1600,,'',0,1200,0,'Downtown',0,300,,'',0,6300,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,1000,,'',0,1000,,'',0,2000,,'',0,6000,,'',0,4500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,11700,,'',0
-'2656',101,163200,,'',0,28500,,'',0,11900,,'',0,10500,,'',0
-'2660',101,72600,,'',0,8000,,'',0,4000,,'',0,7800,,'',0,7900,,'',0,3900,,'',0,8000,,'',0,8000,,'',0,2900,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,10500,,'',0,10900,,'',0
-'2661',101,91100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5400,,'',0,8900,,'',0,10000,,'',0
-'2655',301,83500,0,'Isfeld S',0
-'2655',9900,82100,0,'VMP Connector',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134016 b/src/main/res-next/raw/next_gtfs_schedule_stop_134016
deleted file mode 100644
index 773405e7..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134016
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,71500,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,124700,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134017 b/src/main/res-next/raw/next_gtfs_schedule_stop_134017
deleted file mode 100644
index 86088529..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134017
+++ /dev/null
@@ -1,3 +0,0 @@
-'2655',1200,62200,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,115300,,'',0,59900,,'',0
-'2657',1301,100400,,'',0,21400,,'',0,48600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134018 b/src/main/res-next/raw/next_gtfs_schedule_stop_134018
deleted file mode 100644
index 7f29fc4d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134018
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1201,70700,,'',0,13000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1201,123900,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134019 b/src/main/res-next/raw/next_gtfs_schedule_stop_134019
deleted file mode 100644
index b1d6f69a..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134019
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,62900,,'',0,13000,,'',0,44100,,'',0,15300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,120000,,'',0,55900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134020 b/src/main/res-next/raw/next_gtfs_schedule_stop_134020
deleted file mode 100644
index bcb65e4d..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134020
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,63100,,'',0,17000,,'',0,40100,,'',0,15300,,'',0,34600,,'',0,10000,,'',0
-'2660',1200,120200,,'',0,59900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134021 b/src/main/res-next/raw/next_gtfs_schedule_stop_134021
deleted file mode 100644
index 5ab1545b..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134021
+++ /dev/null
@@ -1,4 +0,0 @@
-'2655',1200,64000,4,'',0,17000,4,'',0,40100,4,'',0,19300,4,'',0,30600,4,'',0,10000,4,'',0
-'2655',1201,64500,,'',0,17000,,'',0,40200,,'',0,19800,,'',0,30000,,'',0,10200,,'',0
-'2660',1200,121100,4,'',0,59900,4,'',0
-'2660',1201,121700,,'',0,60000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_134023 b/src/main/res-next/raw/next_gtfs_schedule_stop_134023
deleted file mode 100644
index 51f12a5c..00000000
--- a/src/main/res-next/raw/next_gtfs_schedule_stop_134023
+++ /dev/null
@@ -1,2 +0,0 @@
-'2655',1200,61400,,'',0,13000,,'',0,40100,,'',0,19300,,'',0,30600,,'',0,10000,,'',0
-'2660',1200,114500,,'',0,59900,,'',0
diff --git a/src/main/res-next/values/next_gtfs_rts_values_gen.xml b/src/main/res-next/values/next_gtfs_rts_values_gen.xml
deleted file mode 100644
index 972f5c8d..00000000
--- a/src/main/res-next/values/next_gtfs_rts_values_gen.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <bool name="next_gtfs_rts_schedule_available">true</bool>
-    <bool name="next_gtfs_rts_frequency_available">false</bool>
-    <string name="next_gtfs_rts_area_min_lat">49.47266</string>
-    <string name="next_gtfs_rts_area_max_lat">49.87338</string>
-    <string name="next_gtfs_rts_area_min_lng">-125.14771</string>
-    <string name="next_gtfs_rts_area_max_lng">-124.79517</string>
-    <integer name="next_gtfs_rts_first_departure_in_sec">1711975800</integer><!-- 2024/04/01 05:50:00 PDT -->
-    <integer name="next_gtfs_rts_last_departure_in_sec">1719802260</integer><!-- 2024/06/30 19:51:00 PDT -->
-</resources>
diff --git a/src/main/res/values/gtfs_rts_values.xml b/src/main/res/values/gtfs_rts_values.xml
index a0599442..348ca2d0 100755
--- a/src/main/res/values/gtfs_rts_values.xml
+++ b/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20240326</integer>
+    <integer name="gtfs_rts_db_version">20240402</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_comox_valley_transit_system_bus.gtfs</string>
     <string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
     <string name="gtfs_rts_contact_us">https://www.bctransit.com/contact</string>