diff --git a/src/main/play/release-notes/en-US/default.txt b/src/main/play/release-notes/en-US/default.txt
index 4047b0784..ad93783f3 100644
--- a/src/main/play/release-notes/en-US/default.txt
+++ b/src/main/play/release-notes/en-US/default.txt
@@ -1,2 +1,2 @@
-Schedule from December 24, 2023 to April 6, 2024.
+Schedule from December 31, 2023 to April 6, 2024.
 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 b6994d0dd..13fb69653 100644
--- a/src/main/res-current/raw/current_gtfs_rts_stops
+++ b/src/main/res-current/raw/current_gtfs_rts_stops
@@ -620,4 +620,3 @@
 120073,'120073','McDougall & Montrose',49.04564,-122.2901,0,1450482301
 120074,'120074','34895 Laburnum Av',49.06456,-122.25748,0,1450482302
 120075,'120075','Marshall & Salton',49.03884,-122.28717,0,1450482303
-120077,'120077','Cedar Vly & Hwy 7',49.13433,-122.32645,0,1450482305
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 171b9e40b..399c0ffa0 100644
--- a/src/main/res-current/raw/current_gtfs_rts_trip_stops
+++ b/src/main/res-current/raw/current_gtfs_rts_trip_stops
@@ -201,8 +201,7 @@
 300,107139,36,0
 300,107146,37,0
 300,107142,38,0
-300,107143,39,0
-300,107140,40,1
+300,107143,39,1
 301,107143,1,0
 301,107144,2,0
 301,107145,3,0
@@ -903,7 +902,7 @@
 2600,107222,23,0
 2600,107223,24,0
 2600,107228,25,0
-2600,105726,26,0
+2600,105726,26,1
 2600,107481,27,0
 2600,120074,28,0
 2600,107247,29,0
@@ -930,14 +929,7 @@
 2600,107077,50,0
 2600,107078,51,0
 2600,107079,52,0
-2600,120073,53,0
-2600,107257,54,0
-2600,107081,55,0
-2600,107082,56,0
-2600,107083,57,0
-2600,107084,58,0
-2600,107085,59,0
-2600,107499,60,1
+2600,120073,53,1
 2601,108262,1,0
 2601,107021,2,0
 2601,107022,3,0
@@ -1096,13 +1088,12 @@
 3300,107805,7,0
 3300,107806,8,0
 3300,107807,9,0
-3300,120077,10,0
-3300,107808,11,0
-3300,107755,12,0
-3300,107756,13,0
-3300,107751,14,0
-3300,120063,15,1
-3300,120064,16,1
+3300,107808,10,0
+3300,107755,11,0
+3300,107756,12,0
+3300,107751,13,0
+3300,120063,14,1
+3300,120064,15,1
 3301,120063,1,0
 3301,107751,2,0
 3301,107756,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 6c04e904c..a3e5ff7c0 100644
--- a/src/main/res-current/raw/current_gtfs_rts_trips
+++ b/src/main/res-current/raw/current_gtfs_rts_trips
@@ -26,8 +26,8 @@
 2201,0,'East Townline',22
 2401,0,'AM',24
 2400,0,'PM',24
-2600,0,'Bourquin Exch',26
 2601,0,'Bourquin Exch',26
+2600,0,'Montrose Exch Only',26
 3101,0,'Bourquin Exch',31
 3100,0,'Mission Exch',31
 3200,0,'Mission Exch',32
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 6aa742f9c..a72b8a408 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,168 +1,7 @@
-'2144',20231224
-'2144',20231225
-'2144',20231226
-'2142',20231227
-'2142',20231228
-'2142',20231229
-'2107',20231230
-'1653',20231231
+'1349',20231231
 '2144',20240101
 '2142',20240102
 '2142',20240103
 '2142',20240104
 '2142',20240105
 '2107',20240106
-'2357',20240107
-'2358',20240108
-'2360',20240108
-'2358',20240109
-'2361',20240109
-'2358',20240110
-'2361',20240110
-'2358',20240111
-'2361',20240111
-'2358',20240112
-'2361',20240112
-'2363',20240113
-'2357',20240114
-'2358',20240115
-'2360',20240115
-'2358',20240116
-'2361',20240116
-'2358',20240117
-'2361',20240117
-'2358',20240118
-'2361',20240118
-'2358',20240119
-'2361',20240119
-'2363',20240120
-'2357',20240121
-'2358',20240122
-'2360',20240122
-'2358',20240123
-'2361',20240123
-'2358',20240124
-'2361',20240124
-'2358',20240125
-'2361',20240125
-'2358',20240126
-'2361',20240126
-'2363',20240127
-'2357',20240128
-'2358',20240129
-'2360',20240129
-'2358',20240130
-'2361',20240130
-'2358',20240131
-'2361',20240131
-'2358',20240201
-'2361',20240201
-'2358',20240202
-'2361',20240202
-'2363',20240203
-'2357',20240204
-'2358',20240205
-'2360',20240205
-'2358',20240206
-'2361',20240206
-'2358',20240207
-'2361',20240207
-'2358',20240208
-'2361',20240208
-'2358',20240209
-'2361',20240209
-'2363',20240210
-'2357',20240211
-'2358',20240212
-'2360',20240212
-'2358',20240213
-'2361',20240213
-'2358',20240214
-'2361',20240214
-'2358',20240215
-'2361',20240215
-'2358',20240216
-'2361',20240216
-'2363',20240217
-'2357',20240218
-'2357',20240219
-'2358',20240220
-'2361',20240220
-'2358',20240221
-'2361',20240221
-'2358',20240222
-'2361',20240222
-'2358',20240223
-'2361',20240223
-'2363',20240224
-'2357',20240225
-'2358',20240226
-'2360',20240226
-'2358',20240227
-'2361',20240227
-'2358',20240228
-'2361',20240228
-'2358',20240229
-'2361',20240229
-'2358',20240301
-'2361',20240301
-'2363',20240302
-'2357',20240303
-'2358',20240304
-'2360',20240304
-'2358',20240305
-'2361',20240305
-'2358',20240306
-'2361',20240306
-'2358',20240307
-'2361',20240307
-'2358',20240308
-'2361',20240308
-'2363',20240309
-'2357',20240310
-'2358',20240311
-'2360',20240311
-'2358',20240312
-'2361',20240312
-'2358',20240313
-'2361',20240313
-'2358',20240314
-'2361',20240314
-'2358',20240315
-'2361',20240315
-'2363',20240316
-'2357',20240317
-'2358',20240318
-'2360',20240318
-'2358',20240319
-'2361',20240319
-'2358',20240320
-'2361',20240320
-'2358',20240321
-'2361',20240321
-'2358',20240322
-'2361',20240322
-'2363',20240323
-'2357',20240324
-'2358',20240325
-'2360',20240325
-'2358',20240326
-'2361',20240326
-'2358',20240327
-'2361',20240327
-'2358',20240328
-'2361',20240328
-'2357',20240329
-'2363',20240330
-'2357',20240331
-'2358',20240401
-'2360',20240401
-'2358',20240402
-'2361',20240402
-'2358',20240403
-'2361',20240403
-'2358',20240404
-'2361',20240404
-'2358',20240405
-'2361',20240405
-'2363',20240406
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105721 b/src/main/res-current/raw/current_gtfs_schedule_stop_105721
index 3b67732de..9e687f7cb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105721
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105721
@@ -1,9 +1,4 @@
-'1653',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,53900,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,53900,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105722 b/src/main/res-current/raw/current_gtfs_schedule_stop_105722
index 9ca653a2b..c1afbec8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105722
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105722
@@ -1,9 +1,4 @@
-'1653',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,55000,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,110000,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,110000,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105723 b/src/main/res-current/raw/current_gtfs_schedule_stop_105723
index 476b48550..8d738e1c0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105723
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105723
@@ -1,4 +1 @@
 '2142',2201,82700,,'',0,62800,,'',0
-'2358',2201,145800,,'',0
-'2360',2201,84700,,'',0
-'2361',2201,81700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105724 b/src/main/res-current/raw/current_gtfs_schedule_stop_105724
index 00723b3a5..fbfae34b2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105724
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105724
@@ -1,4 +1 @@
 '2142',2201,82500,,'',0,62700,,'',0
-'2358',2201,145500,,'',0
-'2360',2201,84400,,'',0
-'2361',2201,81400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105725 b/src/main/res-current/raw/current_gtfs_schedule_stop_105725
index bab6eaa45..f3b725434 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105725
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105725
@@ -1,4 +1 @@
 '2142',2201,82200,,'',0,62700,,'',0
-'2358',2201,145200,,'',0
-'2360',2201,84100,,'',0
-'2361',2201,81100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105726 b/src/main/res-current/raw/current_gtfs_schedule_stop_105726
index 3b708da90..9869528ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105726
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105726
@@ -1,4 +1,2 @@
 '2142',2600,144100,4,'',0
 '2142',2601,80500,,'',0
-'2358',2600,80500,,'',0,63600,0,'Montrose Exch Only',0
-'2358',2601,80500,4,'',0,63600,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105727 b/src/main/res-current/raw/current_gtfs_schedule_stop_105727
index 6cf679cfb..1ab2723dd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105727
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105727
@@ -1,6 +1,3 @@
 '2107',1501,90600,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62300,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62200,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'2142',2600,145100,0,'Montrose Exch Only',0
-'2358',2600,145100,0,'Montrose Exch Only',0
+'2142',2600,145100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105729 b/src/main/res-current/raw/current_gtfs_schedule_stop_105729
index 180965b7b..633e2e1a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105729
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105729
@@ -1,2 +1 @@
 '2142',2400,144700,0,'Ctr Loop',0
-'2358',2400,144700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105730 b/src/main/res-current/raw/current_gtfs_schedule_stop_105730
index ac6fb95d7..9251ae7d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105730
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105730
@@ -1,4 +1 @@
 '2142',2201,82900,,'',0,62800,,'',0
-'2358',2201,150100,,'',0
-'2360',2201,84900,,'',0
-'2361',2201,81900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105731 b/src/main/res-current/raw/current_gtfs_schedule_stop_105731
index e56209e1a..4127b8520 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105731
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105731
@@ -1,13 +1,5 @@
-'1653',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,53900,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,53900,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',2201,83000,,'',0,62800,,'',0
-'2358',2201,150400,,'',0
-'2360',2201,85100,,'',0
-'2361',2201,82100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105732 b/src/main/res-current/raw/current_gtfs_schedule_stop_105732
index cde382207..de2eddc7b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105732
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105732
@@ -1,2 +1 @@
 '2142',2401,80700,0,'Ctr Loop',0
-'2358',2401,80700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105733 b/src/main/res-current/raw/current_gtfs_schedule_stop_105733
index 1f9d5757a..b6a9c12c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105733
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105733
@@ -1,6 +1,2 @@
 '2142',2201,82000,,'',0,62600,,'',0
-'2358',2201,144900,,'',0
-'2360',2201,83900,,'',0
-'2361',2201,80900,,'',0
 '2142',2400,143600,0,'Ctr Loop',0
-'2358',2400,143600,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105734 b/src/main/res-current/raw/current_gtfs_schedule_stop_105734
index feebecd5a..b17f93491 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105734
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105734
@@ -1,6 +1,2 @@
 '2142',2201,84400,,'',0,66900,,'',0
-'2358',2201,151900,,'',0
-'2360',2201,90200,,'',0
-'2361',2201,83200,,'',0
 '2142',2401,75800,0,'Ctr Loop',0
-'2358',2401,75800,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105735 b/src/main/res-current/raw/current_gtfs_schedule_stop_105735
index ec3fbc6b2..240f7ad68 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105735
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105735
@@ -1,6 +1,2 @@
 '2142',2201,84500,,'',0,66800,,'',0
-'2358',2201,151900,,'',0
-'2360',2201,90300,,'',0
-'2361',2201,83300,,'',0
 '2142',2401,75900,0,'Ctr Loop',0
-'2358',2401,75900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105736 b/src/main/res-current/raw/current_gtfs_schedule_stop_105736
index 3a2322dcf..e58ed0e61 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105736
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105736
@@ -1,4 +1 @@
 '2142',2201,83300,,'',0,66800,,'',0
-'2358',2201,150700,,'',0
-'2360',2201,85300,,'',0
-'2361',2201,82300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105737 b/src/main/res-current/raw/current_gtfs_schedule_stop_105737
index f27c9baf3..0d5a51435 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105737
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105737
@@ -1,2 +1 @@
 '2142',2400,143900,0,'Ctr Loop',0
-'2358',2400,143900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105738 b/src/main/res-current/raw/current_gtfs_schedule_stop_105738
index 211e25fbd..79b996fb0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105738
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105738
@@ -1,6 +1,2 @@
 '2142',2201,82100,,'',0,62700,,'',0
-'2358',2201,145100,,'',0
-'2360',2201,84000,,'',0
-'2361',2201,81000,,'',0
 '2142',2400,143700,0,'Ctr Loop',0
-'2358',2400,143700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_105739 b/src/main/res-current/raw/current_gtfs_schedule_stop_105739
index 180965b7b..633e2e1a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_105739
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_105739
@@ -1,2 +1 @@
 '2142',2400,144700,0,'Ctr Loop',0
-'2358',2400,144700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107001 b/src/main/res-current/raw/current_gtfs_schedule_stop_107001
index b39b204ea..fb6102b76 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107001
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107001
@@ -1,9 +1,4 @@
-'1653',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54800,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105800,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,105800,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107005 b/src/main/res-current/raw/current_gtfs_schedule_stop_107005
index 85193bdfe..dc182351f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107005
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107005
@@ -1,9 +1,4 @@
-'1653',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54300,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2900,0,'McMillan',0,6300,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
-'2361',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
-'2363',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107006 b/src/main/res-current/raw/current_gtfs_schedule_stop_107006
index eb40eee9b..d481bce9e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107006
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107006
@@ -1,9 +1,4 @@
-'1653',200,62800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,61100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54500,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2900,0,'McMillan',0,6300,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54500,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112200,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
-'2361',200,112200,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
-'2363',200,61100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107007 b/src/main/res-current/raw/current_gtfs_schedule_stop_107007
index 45df3ce9a..2e12cf028 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107007
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107007
@@ -1,9 +1,4 @@
-'1653',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54600,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3000,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54600,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112300,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112300,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107008 b/src/main/res-current/raw/current_gtfs_schedule_stop_107008
index 3b0d15fa0..d366e176e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107008
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107008
@@ -1,9 +1,4 @@
-'1653',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54700,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3000,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112400,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112400,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107009 b/src/main/res-current/raw/current_gtfs_schedule_stop_107009
index 5a840769b..cabd237f0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107009
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107009
@@ -1,9 +1,4 @@
-'1653',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54700,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3000,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54700,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112500,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112500,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107010 b/src/main/res-current/raw/current_gtfs_schedule_stop_107010
index 1b3ea10a5..ef92656d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107010
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107010
@@ -1,9 +1,4 @@
-'1653',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54800,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3000,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107011 b/src/main/res-current/raw/current_gtfs_schedule_stop_107011
index fba220b7e..12f2bcd94 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107011
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107011
@@ -1,25 +1,12 @@
-'1653',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54900,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60500,,'',0,5100,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60500,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62100,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61300,,'',0,4600,,'',0,7200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,15400,,'',0,5900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2358',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8600,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91700,,'',0,4000,,'',0
-'2361',601,91700,,'',0,4000,,'',0
-'2363',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107012 b/src/main/res-current/raw/current_gtfs_schedule_stop_107012
index 7a9915729..fa7ba5dd3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107012
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107012
@@ -1,29 +1,14 @@
-'1653',100,61500,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61500,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61800,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53500,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61500,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61500,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53500,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61800,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
-'1653',200,63200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61500,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55000,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54900,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112800,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112800,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61500,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,65000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91700,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65800,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65500,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
-'2360',2100,82300,,'',0
-'2361',2100,82300,,'',0
-'2363',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143200,0,'Ctr Loop',0
-'2358',2400,143200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107013 b/src/main/res-current/raw/current_gtfs_schedule_stop_107013
index 0c0f5f1a5..3ca9809db 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107013
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107013
@@ -1,29 +1,14 @@
-'1653',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
-'1653',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55100,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55000,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112900,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112900,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,65100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91800,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65900,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65600,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
-'2360',2100,82400,,'',0
-'2361',2100,82400,,'',0
-'2363',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143300,0,'Ctr Loop',0
-'2358',2400,143300,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107014 b/src/main/res-current/raw/current_gtfs_schedule_stop_107014
index 58ae1a53c..a96b7d931 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107014
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107014
@@ -1,29 +1,14 @@
-'1653',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
-'1653',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55100,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55000,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113000,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,113000,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65100,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,65100,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91900,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65900,,'',0,7400,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65600,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
-'2360',2100,82500,,'',0
-'2361',2100,82500,,'',0
-'2363',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143400,0,'Ctr Loop',0
-'2358',2400,143400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107015 b/src/main/res-current/raw/current_gtfs_schedule_stop_107015
index c1471ef68..e2eeef34d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107015
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107015
@@ -1,31 +1,14 @@
-'1653',100,61700,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61700,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,62000,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,53700,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61700,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61700,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53700,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,62000,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55200,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55100,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,113100,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2361',200,113100,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2363',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7400,,'',0
-'2358',1700,65200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
-'1653',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91900,,'',0,11200,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,12900,,'',0
 '2142',2100,70000,,'',0,3300,,'',0,9300,,'',0,9700,,'',0,11900,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,10900,,'',0
 '2144',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65700,,'',0,7600,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10800,,'',0
-'2360',2100,82500,,'',0
-'2361',2100,82500,,'',0
-'2363',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13000,,'',0
 '2142',2201,84600,,'',0,66800,,'',0
-'2358',2201,152000,,'',0
-'2360',2201,90400,,'',0
-'2361',2201,83400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107016 b/src/main/res-current/raw/current_gtfs_schedule_stop_107016
index 2ea6c9722..a6744e590 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107016
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107016
@@ -1,31 +1,14 @@
-'1653',100,61700,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61700,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,62000,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,53700,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,61700,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61700,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53700,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62000,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55300,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55200,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,113200,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2361',200,113200,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2363',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7400,,'',0
-'2358',1700,65300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
-'1653',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,92000,,'',0,11200,,'',0,16800,,'',0,14600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,12900,,'',0
 '2142',2100,70100,,'',0,3300,,'',0,9300,,'',0,9700,,'',0,11900,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,10900,,'',0
 '2144',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65800,,'',0,7600,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10800,,'',0
-'2360',2100,82600,,'',0
-'2361',2100,82600,,'',0
-'2363',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13000,,'',0
 '2142',2201,84600,,'',0,66900,,'',0
-'2358',2201,152100,,'',0
-'2360',2201,90400,,'',0
-'2361',2201,83400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107017 b/src/main/res-current/raw/current_gtfs_schedule_stop_107017
index b2f93caee..a91979262 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107017
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107017
@@ -1,31 +1,14 @@
-'1653',100,61800,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61800,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,62100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,53800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0
 '2144',100,61800,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61800,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0
-'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55300,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55200,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113300,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2361',200,113300,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',1700,65300,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
-'2358',1700,65300,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
-'1653',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,92100,,'',0,11100,,'',0,16800,,'',0,14700,,'',0,17100,,'',0,12800,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,70100,,'',0,3400,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,16000,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15300,,'',0,11000,,'',0
 '2144',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65800,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15500,,'',0,10900,,'',0
-'2360',2100,82700,,'',0
-'2361',2100,82700,,'',0
-'2363',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13100,,'',0
 '2142',2201,84700,,'',0,66900,,'',0
-'2358',2201,152200,,'',0
-'2360',2201,90500,,'',0
-'2361',2201,83500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107018 b/src/main/res-current/raw/current_gtfs_schedule_stop_107018
index ef06b350a..98472cd8c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107018
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107018
@@ -1,40 +1,18 @@
-'1653',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55400,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55300,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113400,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2361',200,113400,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62800,,'',0,12000,,'',0,10200,,'',0,10000,,'',0,10600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',601,62100,,'',0,8700,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11700,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,10900,,'',0
 '2144',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'2360',601,92600,,'',0,8000,,'',0
-'2361',601,92600,,'',0,8000,,'',0
-'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',1700,65400,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
-'2358',1700,65400,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
-'1653',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,92200,,'',0,11100,,'',0,16800,,'',0,14700,,'',0,17100,,'',0,12800,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,70200,,'',0,3400,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,16000,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15300,,'',0,11000,,'',0
 '2144',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65900,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,7500,,'',0,5300,,'',0,15500,,'',0,10900,,'',0
-'2360',2100,82800,,'',0
-'2361',2100,82800,,'',0
-'2363',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13100,,'',0
 '2142',2201,84800,,'',0,66800,,'',0
-'2358',2201,152200,,'',0
-'2360',2201,90600,,'',0
-'2361',2201,83600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107019 b/src/main/res-current/raw/current_gtfs_schedule_stop_107019
index 957dfdb3b..9ea8ea29e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107019
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107019
@@ -1,40 +1,18 @@
-'1653',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55400,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55300,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113500,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2361',200,113500,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
-'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62800,,'',0,12000,,'',0,10200,,'',0,10000,,'',0,10600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',601,62100,,'',0,8700,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11700,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8100,,'',0,8400,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,10900,,'',0
 '2144',601,62600,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'2360',601,92600,,'',0,8000,,'',0
-'2361',601,92600,,'',0,8000,,'',0
-'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7400,,'',0
-'2358',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
-'1653',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,92200,,'',0,11200,,'',0,16800,,'',0,14700,,'',0,17100,,'',0,12800,,'',0,16900,,'',0,12900,,'',0
 '2142',2100,70200,,'',0,3400,,'',0,9300,,'',0,9700,,'',0,11900,,'',0,15500,,'',0,12000,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15300,,'',0,10900,,'',0
 '2144',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65900,,'',0,7700,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,7500,,'',0,5300,,'',0,15500,,'',0,10800,,'',0
-'2360',2100,82800,,'',0
-'2361',2100,82800,,'',0
-'2363',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13000,,'',0
 '2142',2201,84800,,'',0,66900,,'',0
-'2358',2201,152300,,'',0
-'2360',2201,90600,,'',0
-'2361',2201,83600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107020 b/src/main/res-current/raw/current_gtfs_schedule_stop_107020
index 50b63c36b..76aa486d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107020
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107020
@@ -1,31 +1,14 @@
-'1653',601,62700,4,'',0,13000,4,'',0,10100,4,'',0,14600,4,'',0,5100,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9300,4,'',0,4900,4,'',0,9000,4,'',0,15800,4,'',0,12000,4,'',0,11500,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0
+'1349',601,62700,4,'',0,13000,4,'',0,10100,4,'',0,14600,4,'',0,5100,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9300,4,'',0,4900,4,'',0,9000,4,'',0,15800,4,'',0,12000,4,'',0,11500,4,'',0,10000,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0
 '2107',601,62900,4,'',0,12000,4,'',0,10200,4,'',0,10000,4,'',0,10600,4,'',0,10200,4,'',0,14700,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
 '2142',601,62200,4,'',0,8700,4,'',0,3200,4,'',0,7800,4,'',0,3500,4,'',0,7800,4,'',0,7800,4,'',0,11700,4,'',0,11600,4,'',0,11600,4,'',0,8600,4,'',0,8100,4,'',0,8400,4,'',0,4000,4,'',0,8500,4,'',0,7800,4,'',0,4300,4,'',0,15400,4,'',0,9900,4,'',0,11500,4,'',0,10900,4,'',0
 '2144',601,62700,4,'',0,13000,4,'',0,10100,4,'',0,14600,4,'',0,5100,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9300,4,'',0,4900,4,'',0,9000,4,'',0,15800,4,'',0,12000,4,'',0
-'2357',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
-'2358',601,62200,4,'',0,8900,4,'',0,3100,4,'',0,7700,4,'',0,3500,4,'',0,27500,4,'',0,11600,4,'',0,15500,4,'',0,4700,4,'',0,8600,4,'',0,8200,4,'',0,4000,4,'',0,8500,4,'',0,7800,4,'',0,3800,4,'',0,15500,4,'',0,9800,4,'',0,11500,4,'',0,10900,4,'',0
-'2360',601,92700,4,'',0,8000,4,'',0
-'2361',601,92700,4,'',0,8000,4,'',0
-'2363',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
 '2142',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72500,4,'',0,7800,4,'',0,8500,4,'',0,3500,4,'',0,7400,4,'',0
-'2358',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72500,4,'',0,7800,4,'',0,8500,4,'',0,3500,4,'',0,7500,4,'',0
-'1653',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16500,4,'',0,13000,4,'',0,17500,4,'',0,10000,4,'',0,13000,4,'',0,17000,4,'',0
+'1349',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16500,4,'',0,13000,4,'',0,17500,4,'',0,10000,4,'',0,13000,4,'',0,17000,4,'',0
 '2107',2100,92300,4,'',0,11200,4,'',0,16800,4,'',0,14700,4,'',0,17100,4,'',0,12800,4,'',0,16900,4,'',0,12900,4,'',0
 '2142',2100,70300,4,'',0,3400,4,'',0,9300,4,'',0,9700,4,'',0,11900,4,'',0,15500,4,'',0,12000,4,'',0,13300,4,'',0,7700,4,'',0,9600,4,'',0,3200,4,'',0,9700,4,'',0,15300,4,'',0,10900,4,'',0
 '2144',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16500,4,'',0,13000,4,'',0
-'2357',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16600,4,'',0,13200,4,'',0
-'2358',2100,70000,4,'',0,3700,4,'',0,18900,4,'',0,12000,4,'',0,15400,4,'',0,12000,4,'',0,13600,4,'',0,7700,4,'',0,9400,4,'',0,7500,4,'',0,5300,4,'',0,15500,4,'',0,10800,4,'',0
-'2360',2100,82900,4,'',0
-'2361',2100,82900,4,'',0
-'2363',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9300,4,'',0,9800,4,'',0,13000,4,'',0
 '2142',2201,84900,4,'',0,66900,4,'',0
-'2358',2201,152400,4,'',0
-'2360',2201,90700,4,'',0
-'2361',2201,83700,4,'',0
-'1653',3101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,17000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,17000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3101,83900,4,'',0,7200,4,'',0,2800,4,'',0,7300,4,'',0,3200,4,'',0,7500,4,'',0,3300,4,'',0,7800,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3600,4,'',0,7300,4,'',0,7600,4,'',0,3300,4,'',0,7700,4,'',0,3200,4,'',0,7600,4,'',0,10500,4,'',0,10500,4,'',0
 '2142',3101,65000,4,'',0,7100,4,'',0,1400,4,'',0,1600,4,'',0,5400,4,'',0,1800,4,'',0,1500,4,'',0,1600,4,'',0,5700,4,'',0,1700,4,'',0,2900,4,'',0,7200,4,'',0,7300,4,'',0,3700,4,'',0,7400,4,'',0,3700,4,'',0,7300,4,'',0,7700,4,'',0,3300,4,'',0,7900,4,'',0,3700,4,'',0,5600,4,'',0,1800,4,'',0,1200,4,'',0,1700,4,'',0,5300,4,'',0,1800,4,'',0,1700,4,'',0,1400,4,'',0,5400,4,'',0,1400,4,'',0,1500,4,'',0,1800,4,'',0,6900,4,'',0,8500,4,'',0,12300,4,'',0,10700,4,'',0
 '2144',3101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2357',3101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2358',3101,65000,4,'',0,7100,4,'',0,1400,4,'',0,1600,4,'',0,5400,4,'',0,1800,4,'',0,1500,4,'',0,1600,4,'',0,5700,4,'',0,1700,4,'',0,2900,4,'',0,7200,4,'',0,7300,4,'',0,3700,4,'',0,7400,4,'',0,3700,4,'',0,7300,4,'',0,7700,4,'',0,3300,4,'',0,7900,4,'',0,3700,4,'',0,5600,4,'',0,1800,4,'',0,1200,4,'',0,1700,4,'',0,5300,4,'',0,1800,4,'',0,1700,4,'',0,1400,4,'',0,5400,4,'',0,1400,4,'',0,1500,4,'',0,1800,4,'',0,6900,4,'',0,8500,4,'',0,12300,4,'',0,10700,4,'',0
-'2363',3101,83900,4,'',0,7200,4,'',0,2800,4,'',0,7300,4,'',0,3200,4,'',0,7500,4,'',0,3300,4,'',0,7800,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3600,4,'',0,7300,4,'',0,7600,4,'',0,3300,4,'',0,7700,4,'',0,3200,4,'',0,7600,4,'',0,10500,4,'',0,10500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107021 b/src/main/res-current/raw/current_gtfs_schedule_stop_107021
index ba71d14aa..2505bd912 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107021
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107021
@@ -1,45 +1,25 @@
-'1653',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55700,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63500,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60400,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'1653',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
-'1653',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
 '2142',2400,142100,0,'Ctr Loop',0
-'2358',2400,142100,0,'Ctr Loop',0
 '2142',2600,141500,0,'Sandy Hl',0
 '2142',2601,73100,0,'Sandy Hl',0
-'2358',2601,73100,0,'Sandy Hl',0,68400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107022 b/src/main/res-current/raw/current_gtfs_schedule_stop_107022
index e779f2c2e..3c08c7302 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107022
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107022
@@ -1,45 +1,25 @@
-'1653',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55800,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',501,61900,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,61900,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63500,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60400,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,61900,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60300,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'1653',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
-'1653',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
 '2142',2400,142100,0,'Ctr Loop',0
-'2358',2400,142100,0,'Ctr Loop',0
 '2142',2600,141600,0,'Sandy Hl',0
 '2142',2601,73200,0,'Sandy Hl',0
-'2358',2601,73200,0,'Sandy Hl',0,68400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107023 b/src/main/res-current/raw/current_gtfs_schedule_stop_107023
index 93d8bd6b8..efeb73bd9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107023
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107023
@@ -1,33 +1,18 @@
-'1653',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55800,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2700,0,'McMillan',0,9600,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63600,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'1653',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
 '2142',2400,142200,0,'Ctr Loop',0
-'2358',2400,142200,0,'Ctr Loop',0
 '2142',2600,141600,0,'Sandy Hl',0
 '2142',2601,73200,0,'Sandy Hl',0
-'2358',2601,73200,0,'Sandy Hl',0,68400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107024 b/src/main/res-current/raw/current_gtfs_schedule_stop_107024
index 3b8b5212b..bf2485d0e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107024
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107024
@@ -1,33 +1,18 @@
-'1653',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55900,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,114000,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,114000,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63600,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,62000,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'1653',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1201,71400,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71400,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
 '2142',2400,142200,0,'Ctr Loop',0
-'2358',2400,142200,0,'Ctr Loop',0
 '2142',2600,141700,0,'Sandy Hl',0
 '2142',2601,73300,0,'Sandy Hl',0
-'2358',2601,73300,0,'Sandy Hl',0,68400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107025 b/src/main/res-current/raw/current_gtfs_schedule_stop_107025
index 0aea68cac..a8949f40d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107025
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107025
@@ -1,22 +1,12 @@
-'1653',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55900,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,9600,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,114000,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114000,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,141800,0,'Sandy Hl',0
 '2142',2601,73300,0,'Sandy Hl',0
-'2358',2601,73300,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107026 b/src/main/res-current/raw/current_gtfs_schedule_stop_107026
index aaab30ee5..fe32a3ef7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107026
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107026
@@ -1,22 +1,12 @@
-'1653',200,64200,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64200,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62400,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60000,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64200,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64200,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55900,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,114100,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114100,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62400,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,141900,0,'Sandy Hl',0
 '2142',2601,73400,0,'Sandy Hl',0
-'2358',2601,73400,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107027 b/src/main/res-current/raw/current_gtfs_schedule_stop_107027
index 39889e317..74e0fd59e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107027
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107027
@@ -1,22 +1,12 @@
-'1653',200,64300,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64300,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62500,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60100,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,64300,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64300,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60000,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,114200,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114200,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62500,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,142000,0,'Sandy Hl',0
 '2142',2601,73500,0,'Sandy Hl',0
-'2358',2601,73500,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107030 b/src/main/res-current/raw/current_gtfs_schedule_stop_107030
index 9253ab783..e9ea3db07 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107030
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107030
@@ -1,19 +1,10 @@
-'1653',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60400,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60300,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,114500,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,114500,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,54600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,54600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142300,0,'Sandy Hl',0
 '2142',2601,73800,0,'Sandy Hl',0
-'2358',2601,73800,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107031 b/src/main/res-current/raw/current_gtfs_schedule_stop_107031
index c815d61b0..70ebc35a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107031
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107031
@@ -1,19 +1,10 @@
-'1653',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60400,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60300,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2200,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,142300,0,'Sandy Hl',0
 '2142',2601,73800,0,'Sandy Hl',0
-'2358',2601,73800,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107032 b/src/main/res-current/raw/current_gtfs_schedule_stop_107032
index 2083bfee9..6c157c68d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107032
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107032
@@ -1,19 +1,10 @@
-'1653',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6700,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60400,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,54700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,54700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142400,0,'Sandy Hl',0
 '2142',2601,73900,0,'Sandy Hl',0
-'2358',2601,73900,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107033 b/src/main/res-current/raw/current_gtfs_schedule_stop_107033
index 9bea26799..99324ba9b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107033
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107033
@@ -1,19 +1,10 @@
-'1653',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6700,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
-'2357',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
-'2358',200,60400,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7400,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,114700,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114700,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,54800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,54800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142500,0,'Sandy Hl',0
 '2142',2601,74000,0,'Sandy Hl',0
-'2358',2601,74000,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107034 b/src/main/res-current/raw/current_gtfs_schedule_stop_107034
index f41562f66..00e4ad674 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107034
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107034
@@ -1,19 +1,10 @@
-'1653',200,64800,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64800,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,63000,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60600,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6700,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64800,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
-'2357',200,64800,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
-'2358',200,60500,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7400,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,5800,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,114800,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,114800,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,63000,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',900,54900,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,54900,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,142600,0,'Sandy Hl',0
 '2142',2601,74100,0,'Sandy Hl',0
-'2358',2601,74100,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107035 b/src/main/res-current/raw/current_gtfs_schedule_stop_107035
index 60310059c..bee39db37 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107035
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107035
@@ -1,19 +1,10 @@
-'1653',200,65000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,65000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,63200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60800,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2100,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2600,0,'McMillan',0,6700,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,65000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,65000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60700,0,'McMillan',0,2300,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2200,0,'McMillan',0,5800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,5800,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
-'2360',200,115000,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,115000,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,63200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55000,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,55000,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142800,0,'Sandy Hl',0
 '2142',2601,74300,0,'Sandy Hl',0
-'2358',2601,74300,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107036 b/src/main/res-current/raw/current_gtfs_schedule_stop_107036
index 20cc111e9..afbc44c08 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107036
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107036
@@ -1,10 +1,6 @@
-'1653',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142900,0,'Sandy Hl',0
 '2142',2601,74400,0,'Sandy Hl',0
-'2358',2601,74400,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107037 b/src/main/res-current/raw/current_gtfs_schedule_stop_107037
index 20cc111e9..afbc44c08 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107037
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107037
@@ -1,10 +1,6 @@
-'1653',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2357',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
-'2358',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,142900,0,'Sandy Hl',0
 '2142',2601,74400,0,'Sandy Hl',0
-'2358',2601,74400,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107038 b/src/main/res-current/raw/current_gtfs_schedule_stop_107038
index b6aafc2c9..494544208 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107038
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107038
@@ -1,10 +1,6 @@
-'1653',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55100,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55100,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2600,143000,0,'Sandy Hl',0
 '2142',2601,74500,0,'Sandy Hl',0
-'2358',2601,74500,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107039 b/src/main/res-current/raw/current_gtfs_schedule_stop_107039
index a4ade909b..2d9b421d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107039
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107039
@@ -1,10 +1,6 @@
-'1653',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55200,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55200,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2600,143000,0,'Sandy Hl',0
 '2142',2601,74500,0,'Sandy Hl',0
-'2358',2601,74500,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107040 b/src/main/res-current/raw/current_gtfs_schedule_stop_107040
index 389187c6f..2e1a47416 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107040
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107040
@@ -1,9 +1,5 @@
-'1653',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55200,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55200,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,74600,0,'Sandy Hl',0
-'2358',2601,74600,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107041 b/src/main/res-current/raw/current_gtfs_schedule_stop_107041
index bf830d984..3692c8100 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107041
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107041
@@ -1,9 +1,5 @@
-'1653',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55300,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55300,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2601,74600,0,'Sandy Hl',0
-'2358',2601,74600,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107042 b/src/main/res-current/raw/current_gtfs_schedule_stop_107042
index ebb431e52..5261aa327 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107042
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107042
@@ -1,9 +1,5 @@
-'1653',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,74700,0,'Sandy Hl',0
-'2358',2601,74700,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107043 b/src/main/res-current/raw/current_gtfs_schedule_stop_107043
index ebb431e52..5261aa327 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107043
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107043
@@ -1,9 +1,5 @@
-'1653',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,74700,0,'Sandy Hl',0
-'2358',2601,74700,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107044 b/src/main/res-current/raw/current_gtfs_schedule_stop_107044
index bbc544de0..59b2a6bf0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107044
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107044
@@ -1,9 +1,5 @@
-'1653',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',900,55400,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55400,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
 '2142',2601,74700,0,'Sandy Hl',0
-'2358',2601,74700,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107045 b/src/main/res-current/raw/current_gtfs_schedule_stop_107045
index 953108720..01f791d02 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107045
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107045
@@ -1,13 +1,7 @@
-'1653',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55400,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55400,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1501,90800,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
 '2142',2601,74800,0,'Sandy Hl',0
-'2358',2601,74800,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107046 b/src/main/res-current/raw/current_gtfs_schedule_stop_107046
index 86284e436..09bbd600e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107046
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107046
@@ -1,13 +1,7 @@
-'1653',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1501,90800,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
 '2142',2601,74900,0,'Sandy Hl',0
-'2358',2601,74900,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107047 b/src/main/res-current/raw/current_gtfs_schedule_stop_107047
index 86284e436..09bbd600e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107047
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107047
@@ -1,13 +1,7 @@
-'1653',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1501,90800,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
 '2142',2601,74900,0,'Sandy Hl',0
-'2358',2601,74900,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107048 b/src/main/res-current/raw/current_gtfs_schedule_stop_107048
index a10a7c791..a8a8da41d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107048
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107048
@@ -1,9 +1,5 @@
-'1653',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55600,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55600,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75000,0,'Sandy Hl',0
-'2358',2601,75000,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107049 b/src/main/res-current/raw/current_gtfs_schedule_stop_107049
index b32e7a514..be9446201 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107049
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107049
@@ -1,9 +1,5 @@
-'1653',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55600,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55600,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75100,0,'Sandy Hl',0
-'2358',2601,75100,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107050 b/src/main/res-current/raw/current_gtfs_schedule_stop_107050
index 21003f475..cd81cb332 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107050
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107050
@@ -1,9 +1,5 @@
-'1653',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55700,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55700,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75200,0,'Sandy Hl',0
-'2358',2601,75200,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107051 b/src/main/res-current/raw/current_gtfs_schedule_stop_107051
index 4fa99519a..8499067c7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107051
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107051
@@ -1,9 +1,5 @@
-'1653',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55800,,'',0,10100,,'',0,14300,,'',0,9800,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,14100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55800,,'',0,10100,,'',0,14300,,'',0,9800,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,14100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75300,0,'Sandy Hl',0
-'2358',2601,75300,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107052 b/src/main/res-current/raw/current_gtfs_schedule_stop_107052
index 931d44523..5eb054b49 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107052
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107052
@@ -1,9 +1,5 @@
-'1653',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55900,,'',0,14100,,'',0,10200,,'',0,9900,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,14100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55900,,'',0,14100,,'',0,10200,,'',0,9900,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,14100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75300,0,'Sandy Hl',0
-'2358',2601,75300,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107053 b/src/main/res-current/raw/current_gtfs_schedule_stop_107053
index 43200bd53..8a9689696 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107053
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107053
@@ -1,16 +1,9 @@
-'1653',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0,11000,4,'',0,13100,4,'',0,16900,4,'',0,13000,4,'',0,17300,4,'',0
-'1653',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0,11000,4,'',0,13100,4,'',0,16900,4,'',0,13000,4,'',0,17300,4,'',0
+'1349',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10200,4,'',0,10600,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
 '2107',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',900,55900,4,'',0,14100,4,'',0,10300,4,'',0,9800,4,'',0,5600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,14100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2142',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
 '2144',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
-'2357',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',900,55900,4,'',0,14100,4,'',0,10300,4,'',0,9800,4,'',0,5600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,14100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2358',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
-'2363',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75400,0,'Sandy Hl',0
-'2358',2601,75400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107054 b/src/main/res-current/raw/current_gtfs_schedule_stop_107054
index d43b9f5f5..9984c8e3b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107054
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107054
@@ -1,9 +1,5 @@
-'1653',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75500,0,'Sandy Hl',0
-'2358',2601,75500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107055 b/src/main/res-current/raw/current_gtfs_schedule_stop_107055
index e2512a842..2f650f843 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107055
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107055
@@ -1,9 +1,5 @@
-'1653',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,75500,0,'Sandy Hl',0
-'2358',2601,75500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107056 b/src/main/res-current/raw/current_gtfs_schedule_stop_107056
index a9af7cc75..659fc9dce 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107056
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107056
@@ -1,13 +1,7 @@
-'1653',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1500,92500,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64100,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
 '2142',2601,75600,0,'Sandy Hl',0
-'2358',2601,75600,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107057 b/src/main/res-current/raw/current_gtfs_schedule_stop_107057
index 7275fcbba..b43f65ac6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107057
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107057
@@ -1,13 +1,7 @@
-'1653',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1500,92600,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64200,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
 '2142',2601,75600,0,'Sandy Hl',0
-'2358',2601,75600,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107058 b/src/main/res-current/raw/current_gtfs_schedule_stop_107058
index 181c967b6..78587d285 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107058
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107058
@@ -1,7 +1,4 @@
-'1653',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107059 b/src/main/res-current/raw/current_gtfs_schedule_stop_107059
index 336777c99..70afaf720 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107059
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107059
@@ -1,7 +1,4 @@
-'1653',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107060 b/src/main/res-current/raw/current_gtfs_schedule_stop_107060
index 336777c99..70afaf720 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107060
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107060
@@ -1,7 +1,4 @@
-'1653',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107061 b/src/main/res-current/raw/current_gtfs_schedule_stop_107061
index 399cabf64..390366a41 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107061
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107061
@@ -1,11 +1,6 @@
-'1653',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1501,90700,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62400,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107062 b/src/main/res-current/raw/current_gtfs_schedule_stop_107062
index 93f05459c..48b352922 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107062
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107062
@@ -1,4 +1,2 @@
 '2107',1500,92500,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107063 b/src/main/res-current/raw/current_gtfs_schedule_stop_107063
index 425c0a33e..20ab7cedf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107063
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107063
@@ -1,9 +1,5 @@
-'1653',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,145800,0,'Montrose Exch Only',0
-'2358',2600,145800,0,'Montrose Exch Only',0
+'2142',2600,145800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107064 b/src/main/res-current/raw/current_gtfs_schedule_stop_107064
index 7f9c39a3f..d60505bf9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107064
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107064
@@ -1,9 +1,5 @@
-'1653',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,145900,0,'Montrose Exch Only',0
-'2358',2600,145900,0,'Montrose Exch Only',0
+'2142',2600,145900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107065 b/src/main/res-current/raw/current_gtfs_schedule_stop_107065
index cf71d8682..95d284145 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107065
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107065
@@ -1,9 +1,5 @@
-'1653',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150000,0,'Montrose Exch Only',0
-'2358',2600,150000,0,'Montrose Exch Only',0
+'2142',2600,150000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107066 b/src/main/res-current/raw/current_gtfs_schedule_stop_107066
index cf71d8682..95d284145 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107066
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107066
@@ -1,9 +1,5 @@
-'1653',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150000,0,'Montrose Exch Only',0
-'2358',2600,150000,0,'Montrose Exch Only',0
+'2142',2600,150000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107067 b/src/main/res-current/raw/current_gtfs_schedule_stop_107067
index cf71d8682..95d284145 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107067
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107067
@@ -1,9 +1,5 @@
-'1653',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150000,0,'Montrose Exch Only',0
-'2358',2600,150000,0,'Montrose Exch Only',0
+'2142',2600,150000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107068 b/src/main/res-current/raw/current_gtfs_schedule_stop_107068
index a7fc0badf..963b7e6f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107068
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107068
@@ -1,10 +1,6 @@
-'1653',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150200,0,'Montrose Exch Only',0
+'2142',2600,150200,,'',0
 '2142',2601,81600,,'',0
-'2358',2600,81600,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107069 b/src/main/res-current/raw/current_gtfs_schedule_stop_107069
index a7fc0badf..963b7e6f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107069
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107069
@@ -1,10 +1,6 @@
-'1653',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150200,0,'Montrose Exch Only',0
+'2142',2600,150200,,'',0
 '2142',2601,81600,,'',0
-'2358',2600,81600,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107070 b/src/main/res-current/raw/current_gtfs_schedule_stop_107070
index 23bb05870..9b098b24e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107070
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107070
@@ -1,19 +1,10 @@
-'1653',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,51900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102500,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102500,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2363',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150300,0,'Montrose Exch Only',0
+'2142',2600,150300,,'',0
 '2142',2601,81700,,'',0
-'2358',2600,81700,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107071 b/src/main/res-current/raw/current_gtfs_schedule_stop_107071
index bfade4757..6dc68684b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107071
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107071
@@ -1,19 +1,10 @@
-'1653',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,52000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102500,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102500,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2363',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
+'1349',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,0,'Montrose Exch',0
 '2107',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150400,0,'Montrose Exch Only',0
+'2142',2600,150400,,'',0
 '2142',2601,81700,,'',0
-'2358',2600,81700,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107072 b/src/main/res-current/raw/current_gtfs_schedule_stop_107072
index 1d28f47e2..4448d006a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107072
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107072
@@ -1,19 +1,10 @@
-'1653',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,52100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102700,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
-'2361',201,102700,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
-'2363',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150500,0,'Montrose Exch Only',0
+'2142',2600,150500,,'',0
 '2142',2601,81900,,'',0
-'2358',2600,81900,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107073 b/src/main/res-current/raw/current_gtfs_schedule_stop_107073
index 46463d9c8..5c012d250 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107073
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107073
@@ -1,19 +1,10 @@
-'1653',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,52200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102700,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102700,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2363',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150600,0,'Montrose Exch Only',0
+'2142',2600,150600,,'',0
 '2142',2601,81900,,'',0
-'2358',2600,81900,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107074 b/src/main/res-current/raw/current_gtfs_schedule_stop_107074
index 84ad48a70..f7e32cffa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107074
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107074
@@ -1,19 +1,10 @@
-'1653',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,52200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102800,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102800,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2363',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
 '2144',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150700,0,'Montrose Exch Only',0
+'2142',2600,150700,,'',0
 '2142',2601,82000,,'',0
-'2358',2600,82000,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107075 b/src/main/res-current/raw/current_gtfs_schedule_stop_107075
index 050ee2736..b243f777b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107075
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107075
@@ -1,19 +1,10 @@
-'1653',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52300,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,2000,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102800,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,102800,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150700,0,'Montrose Exch Only',0
+'2142',2600,150700,,'',0
 '2142',2601,82000,,'',0
-'2358',2600,82000,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107076 b/src/main/res-current/raw/current_gtfs_schedule_stop_107076
index 7f36df459..2207f0db7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107076
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107076
@@ -1,19 +1,10 @@
-'1653',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52300,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102900,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102900,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
-'2363',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150800,0,'Montrose Exch Only',0
+'2142',2600,150800,,'',0
 '2142',2601,82000,,'',0
-'2358',2600,82000,,'',0,68800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107077 b/src/main/res-current/raw/current_gtfs_schedule_stop_107077
index 6ec0f9c9c..746e58439 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107077
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107077
@@ -1,19 +1,10 @@
-'1653',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52400,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,6000,,'',0,2500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,103000,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103000,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2142',2600,150800,0,'Montrose Exch Only',0
+'2142',2600,150800,,'',0
 '2142',2601,82100,,'',0
-'2358',2600,82100,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107078 b/src/main/res-current/raw/current_gtfs_schedule_stop_107078
index a2dd77ba3..4ffc485ab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107078
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107078
@@ -1,21 +1,11 @@
-'1653',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52400,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',1601,80400,,'',0,12000,,'',0,68600,,'',0,4600,,'',0
-'2358',1601,80600,,'',0,11900,,'',0,68500,,'',0,4600,,'',0
-'2142',2600,150900,0,'Montrose Exch Only',0
+'2142',2600,150900,,'',0
 '2142',2601,82100,,'',0
-'2358',2600,82100,,'',0,68800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107079 b/src/main/res-current/raw/current_gtfs_schedule_stop_107079
index fbb3085c3..63a21f92f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107079
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107079
@@ -1,46 +1,25 @@
-'1653',100,62600,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62600,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62900,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54600,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62600,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62600,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54600,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62900,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52500,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,52100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',300,64800,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64800,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60100,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64800,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2142',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'1653',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
+'1349',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,0,'Montrose Exch',0
 '2107',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2357',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
-'2358',901,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1500,93300,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64900,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,65000,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
 '2142',1601,80500,,'',0,12000,,'',0,68500,,'',0,4600,,'',0
-'2358',1601,80700,,'',0,11900,,'',0,68400,,'',0,4600,,'',0
-'2142',2600,150900,0,'Montrose Exch Only',0
+'2142',2600,150900,,'',0
 '2142',2601,82200,,'',0
-'2358',2600,82200,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107081 b/src/main/res-current/raw/current_gtfs_schedule_stop_107081
index 0ea2dd88e..2edea552e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107081
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107081
@@ -1,21 +1,11 @@
-'1653',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52700,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
 '2144',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2363',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,82400,,'',0
-'2358',2600,82400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107082 b/src/main/res-current/raw/current_gtfs_schedule_stop_107082
index ac5c7c643..7a7a5e98e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107082
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107082
@@ -1,21 +1,11 @@
-'1653',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52800,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
 '2144',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1700,,'',0,1100,0,'Bourquin Exch Only',0,1000,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2363',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,82500,,'',0
-'2358',2600,82500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107083 b/src/main/res-current/raw/current_gtfs_schedule_stop_107083
index 47858f923..6797624fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107083
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107083
@@ -1,32 +1,17 @@
-'1653',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52800,,'',0,3100,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1700,,'',0,1100,0,'Bourquin Exch Only',0,5100,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'1653',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,5600,,'',0
 '2142',500,62100,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61900,,'',0,9300,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'1653',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2357',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2363',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2142',1200,73800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'2358',1200,73800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
 '2142',2401,81000,0,'Ctr Loop',0
-'2358',2401,81000,0,'Ctr Loop',0
 '2142',2601,82600,,'',0
-'2358',2600,82600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107084 b/src/main/res-current/raw/current_gtfs_schedule_stop_107084
index 5d05800a7..252f711ea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107084
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107084
@@ -1,32 +1,17 @@
-'1653',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52900,,'',0,7100,,'',0,2800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,1000,0,'Bourquin Exch Only',0,5000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'1653',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,5600,,'',0
 '2142',500,62100,,'',0,9200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,62000,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'1653',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2357',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2363',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2142',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15700,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15700,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
 '2142',2401,81100,0,'Ctr Loop',0
-'2358',2401,81100,0,'Ctr Loop',0
 '2142',2601,82700,,'',0
-'2358',2600,82700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107085 b/src/main/res-current/raw/current_gtfs_schedule_stop_107085
index 3f3a9067a..8d60749fa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107085
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107085
@@ -1,44 +1,24 @@
-'1653',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'1653',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52900,,'',0,7100,,'',0,2800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,1000,0,'Bourquin Exch Only',0,5000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103700,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103700,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'1653',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,5600,,'',0
 '2142',500,62200,,'',0,9200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64800,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,62000,,'',0,9300,,'',0,3500,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'1653',701,63900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
+'1349',701,63900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
 '2107',701,64100,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2144',701,63900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2363',701,64100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
-'1653',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2357',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
-'2363',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
 '2142',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'2358',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
 '2142',2401,81100,0,'Ctr Loop',0
-'2358',2401,81100,0,'Ctr Loop',0
 '2142',2601,82700,,'',0
-'2358',2600,82700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107087 b/src/main/res-current/raw/current_gtfs_schedule_stop_107087
index ddf83f26e..1041a9109 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107087
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107087
@@ -1,31 +1,14 @@
-'1653',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2142',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2357',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2358',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0
-'2363',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'1653',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53400,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,104200,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
-'2361',201,104200,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
-'2363',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',1701,62700,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,62700,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90200,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90200,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,80900,,'',0,12700,,'',0,16600,,'',0,13000,,'',0,16900,,'',0,12800,,'',0,17200,,'',0,13600,,'',0
 '2142',2101,55800,,'',0,7800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,12400,,'',0,15400,,'',0,12500,,'',0,7300,,'',0,4900,,'',0,8300,,'',0,10500,,'',0,16000,,'',0,11300,,'',0
 '2144',2101,90200,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0
-'2357',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60100,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,4800,,'',0,8500,,'',0,10300,,'',0,15900,,'',0,11300,,'',0
-'2360',2101,72000,,'',0
-'2361',2101,72000,,'',0
-'2363',2101,73800,,'',0,20000,,'',0,11600,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
 '2142',2201,81800,,'',0,62500,,'',0
-'2358',2201,144500,,'',0
-'2360',2201,83600,,'',0
-'2361',2201,80600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107088 b/src/main/res-current/raw/current_gtfs_schedule_stop_107088
index 110e12d3b..60abe98cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107088
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107088
@@ -1,31 +1,14 @@
-'1653',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
-'1653',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53400,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,104300,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
-'2361',201,104300,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
-'2363',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',1701,62800,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,62800,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90200,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90200,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,80900,,'',0,12700,,'',0,16700,,'',0,13000,,'',0,16900,,'',0,12800,,'',0,17200,,'',0,13600,,'',0
 '2142',2101,55900,,'',0,7800,,'',0,8200,,'',0,10600,,'',0,10900,,'',0,12400,,'',0,15500,,'',0,12500,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,16000,,'',0,11200,,'',0
 '2144',2101,90200,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0
-'2357',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60200,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11400,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,8800,,'',0,4500,,'',0,10300,,'',0,15900,,'',0,11200,,'',0
-'2360',2101,72000,,'',0
-'2361',2101,72000,,'',0
-'2363',2101,73800,,'',0,20000,,'',0,11700,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
 '2142',2201,81900,,'',0,62500,,'',0
-'2358',2201,144600,,'',0
-'2360',2201,83700,,'',0
-'2361',2201,80700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107089 b/src/main/res-current/raw/current_gtfs_schedule_stop_107089
index 45d78497f..e9e4935a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107089
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107089
@@ -1,31 +1,14 @@
-'1653',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2142',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2357',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2358',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0
-'2363',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'1653',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53500,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,104300,,'',0,18000,,'',0,18000,,'',0,19900,,'',0
-'2361',201,104300,,'',0,18000,,'',0,18000,,'',0,19900,,'',0
-'2363',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',1701,62800,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3600,,'',0,8300,,'',0,7900,,'',0,3500,,'',0
-'2358',1701,62800,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81000,,'',0,12700,,'',0,16600,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,55900,,'',0,7800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,12400,,'',0,15400,,'',0,12600,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,15900,,'',0,11300,,'',0
 '2144',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0
-'2357',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60200,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,13000,,'',0,7000,,'',0,8800,,'',0,4500,,'',0,10300,,'',0,15900,,'',0,11200,,'',0
-'2360',2101,72100,,'',0
-'2361',2101,72100,,'',0
-'2363',2101,73900,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
 '2142',2201,81900,,'',0,62500,,'',0
-'2358',2201,144600,,'',0
-'2360',2201,83700,,'',0
-'2361',2201,80700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107090 b/src/main/res-current/raw/current_gtfs_schedule_stop_107090
index 483a277ea..ee65ebaa8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107090
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107090
@@ -1,31 +1,14 @@
-'1653',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
 '2142',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2357',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2358',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'1653',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53500,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,104400,,'',0,17900,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104400,,'',0,17900,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',1701,62900,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,62900,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90300,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90300,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81000,,'',0,12700,,'',0,16700,,'',0,13000,,'',0,16900,,'',0,12800,,'',0,17200,,'',0,13600,,'',0
 '2142',2101,60000,,'',0,3800,,'',0,8200,,'',0,10600,,'',0,10900,,'',0,12400,,'',0,15500,,'',0,12500,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,16000,,'',0,11200,,'',0
 '2144',2101,90300,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0
-'2357',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60300,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11400,,'',0,15500,,'',0,12900,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
-'2360',2101,72100,,'',0
-'2361',2101,72100,,'',0
-'2363',2101,73900,,'',0,20000,,'',0,11700,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
 '2142',2201,81900,,'',0,62600,,'',0
-'2358',2201,144700,,'',0
-'2360',2201,83800,,'',0
-'2361',2201,80800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107091 b/src/main/res-current/raw/current_gtfs_schedule_stop_107091
index 9b58840fa..0adcb0a1d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107091
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107091
@@ -1,29 +1,14 @@
-'1653',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2357',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2358',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'1653',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53600,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,104500,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104500,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',1701,63000,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3600,,'',0,8300,,'',0,7900,,'',0,3500,,'',0
-'2358',1701,63000,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90500,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90500,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81200,,'',0,12700,,'',0,16600,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60100,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11400,,'',0,12600,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,15900,,'',0,11300,,'',0
 '2144',2101,90500,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,13100,,'',0
-'2357',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15300,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
-'2360',2101,72300,,'',0
-'2361',2101,72300,,'',0
-'2363',2101,74100,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
 '2142',2401,75900,0,'Ctr Loop',0
-'2358',2401,75900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107092 b/src/main/res-current/raw/current_gtfs_schedule_stop_107092
index f157fd951..d07877a98 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107092
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107092
@@ -1,16 +1,8 @@
-'1653',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'1653',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53700,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,2000,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,104600,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104600,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107093 b/src/main/res-current/raw/current_gtfs_schedule_stop_107093
index 3458b156c..007e89e34 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107093
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107093
@@ -1,16 +1,8 @@
-'1653',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'1653',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53800,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,104700,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104700,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107094 b/src/main/res-current/raw/current_gtfs_schedule_stop_107094
index 2a19d63c6..ac1fe5cb6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107094
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107094
@@ -1,20 +1,9 @@
-'1653',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53900,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,104800,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104800,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'1653',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,54900,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54600,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7100,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',2201,83800,,'',0,66800,,'',0
-'2358',2201,151200,,'',0
-'2360',2201,85800,,'',0
-'2361',2201,82800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107095 b/src/main/res-current/raw/current_gtfs_schedule_stop_107095
index 4b0e8f229..bb1e96868 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107095
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107095
@@ -1,13 +1,5 @@
-'1653',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54000,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2200,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,104900,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,104900,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',2201,83900,,'',0,66800,,'',0
-'2358',2201,151300,,'',0
-'2360',2201,85800,,'',0
-'2361',2201,82800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107096 b/src/main/res-current/raw/current_gtfs_schedule_stop_107096
index 4d5d8ed03..a47aed223 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107096
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107096
@@ -1,13 +1,5 @@
-'1653',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54100,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105000,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,105000,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',2201,84000,,'',0,66800,,'',0
-'2358',2201,151400,,'',0
-'2360',2201,85900,,'',0
-'2361',2201,82900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107097 b/src/main/res-current/raw/current_gtfs_schedule_stop_107097
index 79f11d3be..15e24d45d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107097
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107097
@@ -1,13 +1,5 @@
-'1653',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54200,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9500,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105100,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2361',201,105100,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
-'2363',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',2201,82400,,'',0,62700,,'',0
-'2358',2201,145400,,'',0
-'2360',2201,84300,,'',0
-'2361',2201,81300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107098 b/src/main/res-current/raw/current_gtfs_schedule_stop_107098
index e39ad82f9..284b06c9a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107098
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107098
@@ -1,9 +1,4 @@
-'1653',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54300,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,53900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105200,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105200,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107099 b/src/main/res-current/raw/current_gtfs_schedule_stop_107099
index 095118781..aadd11afa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107099
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107099
@@ -1,9 +1,4 @@
-'1653',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54500,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,54100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105400,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105400,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107100 b/src/main/res-current/raw/current_gtfs_schedule_stop_107100
index 1c89c7960..515d1b649 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107100
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107100
@@ -1,9 +1,4 @@
-'1653',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54600,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105500,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105500,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107101 b/src/main/res-current/raw/current_gtfs_schedule_stop_107101
index 4d92146f2..f9627cd03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107101
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107101
@@ -1,9 +1,4 @@
-'1653',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54600,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105600,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105600,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107102 b/src/main/res-current/raw/current_gtfs_schedule_stop_107102
index 9899e66b3..c1833a3a1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107102
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107102
@@ -1,9 +1,4 @@
-'1653',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54700,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105600,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,105600,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107107 b/src/main/res-current/raw/current_gtfs_schedule_stop_107107
index 8025e8aec..95399ce69 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107107
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107107
@@ -1,16 +1,8 @@
-'1653',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2142',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,2300,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
-'1653',200,61800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,61800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,53600,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2700,0,'McMillan',0,2400,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,61800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
-'2357',200,61800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
-'2358',200,53600,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111100,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
-'2361',200,111100,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
-'2363',200,60100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107108 b/src/main/res-current/raw/current_gtfs_schedule_stop_107108
index 731dc7eee..2cc365cda 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107108
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107108
@@ -1,7 +1,4 @@
-'1653',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2142',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,2300,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107109 b/src/main/res-current/raw/current_gtfs_schedule_stop_107109
index f0350e0b3..7793ce8b4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107109
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107109
@@ -1,7 +1,4 @@
-'1653',100,60700,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60700,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,60900,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2142',100,52600,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,2300,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60700,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60700,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52600,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,60900,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107110 b/src/main/res-current/raw/current_gtfs_schedule_stop_107110
index f784ab3f6..9a950d8fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107110
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107110
@@ -1,16 +1,8 @@
-'1653',100,60700,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60700,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,60900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,52600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60700,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60700,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,60900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
-'1653',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,53700,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,1900,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,2400,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
-'2357',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
-'2358',200,53700,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111200,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
-'2361',200,111200,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
-'2363',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107111 b/src/main/res-current/raw/current_gtfs_schedule_stop_107111
index dc713a19f..77f9649b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107111
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107111
@@ -1,16 +1,8 @@
-'1653',100,60800,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60800,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61000,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2142',100,52700,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60800,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60800,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52700,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61000,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
-'1653',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,53700,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,53700,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111300,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
-'2361',200,111300,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
-'2363',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107112 b/src/main/res-current/raw/current_gtfs_schedule_stop_107112
index e8574420c..3ff921dde 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107112
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107112
@@ -1,7 +1,4 @@
-'1653',100,60900,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,60900,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,52800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,60900,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,60900,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107113 b/src/main/res-current/raw/current_gtfs_schedule_stop_107113
index 1f7358210..7c975caf9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107113
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107113
@@ -1,7 +1,4 @@
-'1653',100,61000,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,61000,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61200,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2142',100,52900,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61000,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61000,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,52900,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61200,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107115 b/src/main/res-current/raw/current_gtfs_schedule_stop_107115
index 2d4ad4864..e589fdd93 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107115
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107115
@@ -1,7 +1,4 @@
-'1653',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107116 b/src/main/res-current/raw/current_gtfs_schedule_stop_107116
index cea62fd57..49c946ba7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107116
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107116
@@ -1,11 +1,5 @@
-'1653',100,61200,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,61200,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61400,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53100,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61200,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61200,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53100,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61400,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',2201,83400,,'',0,66800,,'',0
-'2358',2201,150800,,'',0
-'2360',2201,85400,,'',0
-'2361',2201,82400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107117 b/src/main/res-current/raw/current_gtfs_schedule_stop_107117
index 1f71d07b3..620e6dfd9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107117
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107117
@@ -1,11 +1,5 @@
-'1653',100,61300,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,61300,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61500,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53200,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61300,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61300,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53200,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61500,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',2201,83500,,'',0,66800,,'',0
-'2358',2201,150900,,'',0
-'2360',2201,85500,,'',0
-'2361',2201,82500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107118 b/src/main/res-current/raw/current_gtfs_schedule_stop_107118
index bdfcc3c62..4812ac201 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107118
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107118
@@ -1,11 +1,5 @@
-'1653',100,61300,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61300,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61600,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53300,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61300,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61300,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53300,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61600,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',2201,83600,,'',0,66800,,'',0
-'2358',2201,151000,,'',0
-'2360',2201,85600,,'',0
-'2361',2201,82600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107119 b/src/main/res-current/raw/current_gtfs_schedule_stop_107119
index aea1e32ad..26700114b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107119
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107119
@@ -1,11 +1,5 @@
-'1653',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',2201,83700,,'',0,66800,,'',0
-'2358',2201,151100,,'',0
-'2360',2201,85700,,'',0
-'2361',2201,82700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107120 b/src/main/res-current/raw/current_gtfs_schedule_stop_107120
index 7aa2a2b2c..05d0483b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107120
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107120
@@ -1,7 +1,4 @@
-'1653',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
+'1349',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'Bourquin Exch Only',0
 '2107',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107121 b/src/main/res-current/raw/current_gtfs_schedule_stop_107121
index fb875f5dc..c630652ca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107121
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107121
@@ -1,14 +1,8 @@
-'1653',301,63500,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63500,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60700,,'',0,5100,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4400,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63500,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2358',301,60700,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',500,64000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61200,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2358',500,61100,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107122 b/src/main/res-current/raw/current_gtfs_schedule_stop_107122
index d9b721726..5ac44d591 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107122
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107122
@@ -1,32 +1,17 @@
-'1653',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',301,62800,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62800,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,55800,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2107',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',300,55500,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2142',301,60000,,'',0,5000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',301,62800,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2357',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2358',301,60000,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2363',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'1653',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55600,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55600,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85600,,'',0,8000,,'',0
-'2361',601,85600,,'',0,8000,,'',0
-'2363',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74000,0,'Ctr Loop',0
-'2358',2401,74000,0,'Ctr Loop',0
-'1653',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,1800,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
 '2144',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'2363',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107123 b/src/main/res-current/raw/current_gtfs_schedule_stop_107123
index 637ee1641..0dd2186ec 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107123
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107123
@@ -1,32 +1,17 @@
-'1653',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',301,62800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,55800,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2107',301,64900,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',300,55500,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2142',301,60000,,'',0,5100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',300,64200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',301,62800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2357',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2358',301,60000,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2363',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55600,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3900,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55600,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85700,,'',0,8000,,'',0
-'2361',601,85700,,'',0,8000,,'',0
-'2363',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74100,0,'Ctr Loop',0
-'2358',2401,74100,0,'Ctr Loop',0
-'1653',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,1800,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
 '2144',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'2363',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107124 b/src/main/res-current/raw/current_gtfs_schedule_stop_107124
index eb22a9656..64be37c72 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107124
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107124
@@ -1,25 +1,13 @@
-'1653',300,64300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55600,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55700,,'',0,8500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55700,,'',0,8500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85700,,'',0,8000,,'',0
-'2361',601,85700,,'',0,8000,,'',0
-'2363',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74100,0,'Ctr Loop',0
-'2358',2401,74100,0,'Ctr Loop',0
-'1653',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,1800,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107125 b/src/main/res-current/raw/current_gtfs_schedule_stop_107125
index 0fabc157f..c65596c56 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107125
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107125
@@ -1,25 +1,13 @@
-'1653',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55700,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55700,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3900,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55700,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85800,,'',0,8000,,'',0
-'2361',601,85800,,'',0,8000,,'',0
-'2363',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74200,0,'Ctr Loop',0
-'2358',2401,74200,0,'Ctr Loop',0
-'1653',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
 '2144',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'2363',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107126 b/src/main/res-current/raw/current_gtfs_schedule_stop_107126
index db5dbd409..4681db986 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107126
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107126
@@ -1,25 +1,13 @@
-'1653',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55700,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64400,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60600,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55700,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55700,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85800,,'',0,8000,,'',0
-'2361',601,85800,,'',0,8000,,'',0
-'2363',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74200,0,'Ctr Loop',0
-'2358',2401,74200,0,'Ctr Loop',0
-'1653',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107127 b/src/main/res-current/raw/current_gtfs_schedule_stop_107127
index b0d24d652..99f7163ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107127
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107127
@@ -1,14 +1,8 @@
-'1653',300,64500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55800,,'',0,7300,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
 '2144',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'2363',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107128 b/src/main/res-current/raw/current_gtfs_schedule_stop_107128
index b2ceee7cf..6bf278530 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107128
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107128
@@ -1,14 +1,8 @@
-'1653',300,64600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55900,,'',0,7300,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',3100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84900,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60200,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60200,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,84900,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107129 b/src/main/res-current/raw/current_gtfs_schedule_stop_107129
index c648329de..aa229a4a7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107129
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107129
@@ -1,14 +1,8 @@
-'1653',300,64700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,64700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60000,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107130 b/src/main/res-current/raw/current_gtfs_schedule_stop_107130
index 17a2e31a8..35ef3f1a2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107130
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107130
@@ -1,14 +1,8 @@
-'1653',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54900,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54900,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',300,65100,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65100,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60400,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65100,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107131 b/src/main/res-current/raw/current_gtfs_schedule_stop_107131
index 56b8edb3c..1bf4301e9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107131
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107131
@@ -1,14 +1,8 @@
-'1653',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
 '2142',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2357',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2358',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
-'1653',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60700,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9300,,'',0
 '2142',300,60500,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107132 b/src/main/res-current/raw/current_gtfs_schedule_stop_107132
index ab4db2859..a40ea0b60 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107132
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107132
@@ -1,14 +1,8 @@
-'1653',100,63000,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63000,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63300,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63000,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,63000,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63300,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60500,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65200,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107133 b/src/main/res-current/raw/current_gtfs_schedule_stop_107133
index ccd05c498..eea106b9c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107133
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107133
@@ -1,7 +1,4 @@
-'1653',300,65300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9300,,'',0
 '2142',300,60600,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107134 b/src/main/res-current/raw/current_gtfs_schedule_stop_107134
index 7a183b493..5cd6fbf8f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107134
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107134
@@ -1,7 +1,4 @@
-'1653',300,65300,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65300,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60600,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65300,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107135 b/src/main/res-current/raw/current_gtfs_schedule_stop_107135
index 3e5474c7b..db59e2f34 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107135
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107135
@@ -1,7 +1,4 @@
-'1653',300,65400,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65400,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60700,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65400,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107136 b/src/main/res-current/raw/current_gtfs_schedule_stop_107136
index 79a330e97..4f3699819 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107136
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107136
@@ -1,16 +1,9 @@
-'1653',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61000,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9300,,'',0
 '2142',300,60800,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
-'1653',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,73900,,'',0,12000,,'',0,68500,,'',0,8500,,'',0
-'2358',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107137 b/src/main/res-current/raw/current_gtfs_schedule_stop_107137
index 91c0e22d8..f63a40c3d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107137
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107137
@@ -1,16 +1,9 @@
-'1653',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60800,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65500,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,73900,,'',0,12000,,'',0,68500,,'',0,8500,,'',0
-'2358',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107138 b/src/main/res-current/raw/current_gtfs_schedule_stop_107138
index c0b489106..256589f9a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107138
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107138
@@ -1,7 +1,4 @@
-'1653',300,65700,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65700,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61200,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9700,,'',0,9300,,'',0
 '2142',300,61000,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65700,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,61000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107139 b/src/main/res-current/raw/current_gtfs_schedule_stop_107139
index 24e52068e..5943035b3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107139
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107139
@@ -1,7 +1,4 @@
-'1653',300,65800,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65800,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9700,,'',0,9300,,'',0
 '2142',300,61100,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65800,,'',0,10000,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,61100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107140 b/src/main/res-current/raw/current_gtfs_schedule_stop_107140
index 2faf6220f..8f8ea73b5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107140
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107140
@@ -1,10 +1,4 @@
-'1653',301,60800,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,60800,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,62800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9300,0,'Montrose Exch Only',0
 '2142',301,53900,,'',0,8800,,'',0,7300,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,60800,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
-'2357',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',300,62500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3800,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3300,4,'',0,7700,4,'',0,2800,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
-'2358',301,54000,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9000,0,'Montrose Exch Only',0
-'2363',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
-'2363',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107141 b/src/main/res-current/raw/current_gtfs_schedule_stop_107141
index 59dbb6680..91c653405 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107141
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107141
@@ -1,4 +1,4 @@
-'1653',301,60700,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,60700,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,62700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9300,0,'Montrose Exch Only',0
 '2142',301,53800,,'',0,8800,,'',0,3300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,60700,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107142 b/src/main/res-current/raw/current_gtfs_schedule_stop_107142
index 5e68ed4bf..b91d77dcf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107142
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107142
@@ -1,7 +1,4 @@
-'1653',300,70200,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,70200,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5600,,'',0,9300,,'',0
 '2142',300,61600,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,5500,,'',0
 '2144',300,70200,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2357',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2358',300,61500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107143 b/src/main/res-current/raw/current_gtfs_schedule_stop_107143
index dcfe6a61f..2a11af767 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107143
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107143
@@ -1,11 +1,8 @@
-'1653',300,70400,4,'',0,10000,4,'',0,5500,4,'',0,10000,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,5000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1653',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',300,70400,4,'',0,10000,4,'',0,5500,4,'',0,10000,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,5000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',300,61900,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,9600,4,'',0,9600,4,'',0,5300,4,'',0
 '2107',301,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,5300,0,'Montrose Exch Only',0
 '2142',300,61800,4,'',0,3300,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3000,4,'',0,8500,4,'',0,8500,4,'',0,10000,4,'',0,5500,4,'',0
 '2142',301,53100,,'',0,8800,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,5500,0,'Montrose Exch Only',0
 '2144',300,70400,4,'',0,10000,4,'',0,5500,4,'',0,10000,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,5000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
 '2144',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0
-'2357',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2358',300,61700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
-'2363',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107144 b/src/main/res-current/raw/current_gtfs_schedule_stop_107144
index ab4dbfb3c..ecb1d209b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107144
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107144
@@ -1,4 +1,4 @@
-'1653',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,5300,0,'Montrose Exch Only',0
 '2142',301,53100,,'',0,8800,,'',0,3300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,5500,0,'Montrose Exch Only',0
 '2144',301,60000,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,5900,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107145 b/src/main/res-current/raw/current_gtfs_schedule_stop_107145
index 936b58cd3..8a8c3d72a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107145
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107145
@@ -1,4 +1,4 @@
-'1653',301,60100,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,60100,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,62100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,5300,0,'Montrose Exch Only',0
 '2142',301,53200,,'',0,8800,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,5500,0,'Montrose Exch Only',0
 '2144',301,60100,,'',0,10500,,'',0,10000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107146 b/src/main/res-current/raw/current_gtfs_schedule_stop_107146
index 4aeb5dbf0..39c4f413b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107146
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107146
@@ -1,7 +1,4 @@
-'1653',300,70000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,70000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,61500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5600,,'',0,9300,,'',0
 '2142',300,61400,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3600,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,70000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2357',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'2358',300,61300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107147 b/src/main/res-current/raw/current_gtfs_schedule_stop_107147
index c514b11e9..45c4e4abc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107147
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107147
@@ -1,7 +1,4 @@
-'1653',301,61000,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61000,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54100,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61000,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54200,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107148 b/src/main/res-current/raw/current_gtfs_schedule_stop_107148
index d7c7b80a7..b70130f06 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107148
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107148
@@ -1,7 +1,4 @@
-'1653',301,61100,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61100,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54200,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61100,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54300,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107149 b/src/main/res-current/raw/current_gtfs_schedule_stop_107149
index fe84f4660..c3b11a945 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107149
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107149
@@ -1,14 +1,8 @@
-'1653',301,61200,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61200,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54300,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61200,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54400,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'1653',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63100,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64400,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
 '2144',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64400,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'2363',701,63100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107150 b/src/main/res-current/raw/current_gtfs_schedule_stop_107150
index 5e14a69a2..5567095ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107150
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107150
@@ -1,14 +1,8 @@
-'1653',301,61300,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61300,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54400,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61300,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54500,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'1653',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63100,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64500,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
 '2144',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64500,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'2363',701,63100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107151 b/src/main/res-current/raw/current_gtfs_schedule_stop_107151
index c030bacf5..fe3809dc8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107151
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107151
@@ -1,7 +1,4 @@
-'1653',301,61400,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61400,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54500,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61400,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54500,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107153 b/src/main/res-current/raw/current_gtfs_schedule_stop_107153
index 160cfba09..a5925ff64 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107153
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107153
@@ -1,7 +1,4 @@
-'1653',301,61600,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61600,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54700,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61600,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54700,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107154 b/src/main/res-current/raw/current_gtfs_schedule_stop_107154
index 44d448968..fa8ea44b6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107154
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107154
@@ -1,14 +1,8 @@
-'1653',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
+'1349',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
 '2107',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'1653',301,61600,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61600,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9100,0,'Montrose Exch Only',0
 '2142',301,54700,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61600,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54700,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107155 b/src/main/res-current/raw/current_gtfs_schedule_stop_107155
index ed75c7578..ec36fd376 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107155
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107155
@@ -1,14 +1,8 @@
-'1653',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
+'1349',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
 '2107',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'1653',301,61700,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61700,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54800,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61700,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54800,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107156 b/src/main/res-current/raw/current_gtfs_schedule_stop_107156
index eef51239a..1dd27bacd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107156
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107156
@@ -1,14 +1,8 @@
-'1653',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
+'1349',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
 '2107',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'1653',301,61700,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61700,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9100,0,'Montrose Exch Only',0
 '2142',301,54800,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61700,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54800,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107157 b/src/main/res-current/raw/current_gtfs_schedule_stop_107157
index 51b919b1e..205c0abd4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107157
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107157
@@ -1,14 +1,8 @@
-'1653',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
+'1349',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
 '2107',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'1653',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0,9100,0,'Montrose Exch Only',0
 '2142',301,54900,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107158 b/src/main/res-current/raw/current_gtfs_schedule_stop_107158
index a3ee90364..1e408b1f1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107158
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107158
@@ -1,18 +1,10 @@
-'1653',301,62000,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62000,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55100,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62000,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55100,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'1653',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90000,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107159 b/src/main/res-current/raw/current_gtfs_schedule_stop_107159
index 2117ae626..b804499bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107159
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107159
@@ -1,14 +1,8 @@
-'1653',301,62000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55200,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'1653',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107160 b/src/main/res-current/raw/current_gtfs_schedule_stop_107160
index 4ad3d5ca7..9274a8f9f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107160
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107160
@@ -1,14 +1,8 @@
-'1653',301,62100,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62100,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55200,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62100,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'1653',3101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83500,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64600,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64600,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83500,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107161 b/src/main/res-current/raw/current_gtfs_schedule_stop_107161
index 4a26419d0..5dd567f9a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107161
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107161
@@ -1,14 +1,8 @@
-'1653',301,62100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55300,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'1653',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107162 b/src/main/res-current/raw/current_gtfs_schedule_stop_107162
index 8a674bf82..65fe1ee20 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107162
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107162
@@ -1,16 +1,9 @@
-'1653',301,62200,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62200,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55300,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62200,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2142',2400,145500,0,'Ctr Loop',0
-'2358',2400,145500,0,'Ctr Loop',0
-'1653',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107163 b/src/main/res-current/raw/current_gtfs_schedule_stop_107163
index cd783c243..feb76b18c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107163
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107163
@@ -1,16 +1,9 @@
-'1653',301,62200,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62200,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55400,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62200,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55400,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2142',2400,145600,0,'Ctr Loop',0
-'2358',2400,145600,0,'Ctr Loop',0
-'1653',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107164 b/src/main/res-current/raw/current_gtfs_schedule_stop_107164
index c5780c20e..58db7dd2e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107164
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107164
@@ -1,16 +1,9 @@
-'1653',301,62300,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62300,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55500,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62300,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2142',2400,145700,0,'Ctr Loop',0
-'2358',2400,145700,0,'Ctr Loop',0
-'1653',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107165 b/src/main/res-current/raw/current_gtfs_schedule_stop_107165
index 4433254e5..75e5c5720 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107165
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107165
@@ -1,23 +1,13 @@
-'1653',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
-'1653',301,62400,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',301,62400,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2107',301,64500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0
 '2142',300,55000,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2142',301,55500,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0
 '2144',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',301,62400,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2357',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',300,55000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2358',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2363',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
 '2142',2400,145700,0,'Ctr Loop',0
-'2358',2400,145700,0,'Ctr Loop',0
-'1653',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107166 b/src/main/res-current/raw/current_gtfs_schedule_stop_107166
index aefe54f94..f1746f441 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107166
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107166
@@ -1,23 +1,13 @@
-'1653',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
-'1653',301,62400,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',301,62400,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2107',301,64500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',300,55000,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2142',301,55600,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',300,63700,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',301,62400,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2357',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',300,55000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2358',301,55600,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2363',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
 '2142',2400,145800,0,'Ctr Loop',0
-'2358',2400,145800,0,'Ctr Loop',0
-'1653',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107167 b/src/main/res-current/raw/current_gtfs_schedule_stop_107167
index 8db73642e..360c0aada 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107167
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107167
@@ -1,7 +1,4 @@
-'1653',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107168 b/src/main/res-current/raw/current_gtfs_schedule_stop_107168
index 516435945..48c547ec9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107168
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107168
@@ -1,7 +1,4 @@
-'1653',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107169 b/src/main/res-current/raw/current_gtfs_schedule_stop_107169
index 516435945..48c547ec9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107169
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107169
@@ -1,7 +1,4 @@
-'1653',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107170 b/src/main/res-current/raw/current_gtfs_schedule_stop_107170
index e129dcf42..b206c9f55 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107170
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107170
@@ -1,7 +1,4 @@
-'1653',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107171 b/src/main/res-current/raw/current_gtfs_schedule_stop_107171
index c49cf3548..453024563 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107171
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107171
@@ -1,7 +1,4 @@
-'1653',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107172 b/src/main/res-current/raw/current_gtfs_schedule_stop_107172
index 17653d243..18e99b07b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107172
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107172
@@ -1,7 +1,4 @@
-'1653',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107175 b/src/main/res-current/raw/current_gtfs_schedule_stop_107175
index 0542257d4..96f04d02e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107175
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107175
@@ -1,27 +1,14 @@
-'1653',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54400,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61100,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2358',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2142',1700,64800,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,64800,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91500,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65600,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65300,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9400,,'',0,15600,,'',0,11000,,'',0
-'2360',2100,82100,,'',0
-'2361',2100,82100,,'',0
-'2363',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143100,0,'Ctr Loop',0
-'2358',2400,143100,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107176 b/src/main/res-current/raw/current_gtfs_schedule_stop_107176
index 7567d1e3a..b003eb7bd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107176
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107176
@@ -1,27 +1,14 @@
-'1653',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54400,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61100,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,63900,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2358',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2142',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4300,,'',0,7700,,'',0,7500,,'',0
-'2358',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4300,,'',0,7700,,'',0,7600,,'',0
-'1653',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91600,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65700,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13200,,'',0,7700,,'',0,9600,,'',0,3300,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65400,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9400,,'',0,15600,,'',0,10900,,'',0
-'2360',2100,82200,,'',0
-'2361',2100,82200,,'',0
-'2363',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143100,0,'Ctr Loop',0
-'2358',2400,143100,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107177 b/src/main/res-current/raw/current_gtfs_schedule_stop_107177
index cd043a400..50e273f92 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107177
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107177
@@ -1,27 +1,14 @@
-'1653',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54400,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',500,63900,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,63900,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61200,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,63900,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61100,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
 '2142',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91600,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65700,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,15400,,'',0,11000,,'',0
 '2144',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65400,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,11000,,'',0
-'2360',2100,82200,,'',0
-'2361',2100,82200,,'',0
-'2363',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
 '2142',2400,143200,0,'Ctr Loop',0
-'2358',2400,143200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107178 b/src/main/res-current/raw/current_gtfs_schedule_stop_107178
index 36b53c059..5aefe08ff 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107178
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107178
@@ -1,7 +1,4 @@
-'1653',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54600,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7100,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107179 b/src/main/res-current/raw/current_gtfs_schedule_stop_107179
index d87e4a68b..c7bea5f4b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107179
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107179
@@ -1,7 +1,4 @@
-'1653',300,63300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55000,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54600,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63300,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54600,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107180 b/src/main/res-current/raw/current_gtfs_schedule_stop_107180
index 1d7e05b2d..0bd851556 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107180
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107180
@@ -1,7 +1,4 @@
-'1653',300,63400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54700,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107181 b/src/main/res-current/raw/current_gtfs_schedule_stop_107181
index 0c4f7509e..78cfa4eb3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107181
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107181
@@ -1,7 +1,4 @@
-'1653',300,63500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55100,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54800,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7100,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54700,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107182 b/src/main/res-current/raw/current_gtfs_schedule_stop_107182
index 79024f914..7ec213b88 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107182
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107182
@@ -1,7 +1,4 @@
-'1653',300,63500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55200,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54800,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63500,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54800,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107183 b/src/main/res-current/raw/current_gtfs_schedule_stop_107183
index 3de89ec9b..fe4f67368 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107183
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107183
@@ -1,7 +1,4 @@
-'1653',300,63600,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63600,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54900,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63600,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107184 b/src/main/res-current/raw/current_gtfs_schedule_stop_107184
index d3c2abc45..c859785a0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107184
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107184
@@ -1,7 +1,4 @@
-'1653',300,63600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,55200,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54900,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63600,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107185 b/src/main/res-current/raw/current_gtfs_schedule_stop_107185
index ee9e177c5..0879d6d25 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107185
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107185
@@ -1,7 +1,4 @@
-'1653',100,63100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63400,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,55100,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,1200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,63100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,55100,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63400,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107186 b/src/main/res-current/raw/current_gtfs_schedule_stop_107186
index 231a8f821..783d66f9e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107186
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107186
@@ -1,9 +1,5 @@
-'1653',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63500,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
 '2142',100,55300,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,1200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2357',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2358',100,55300,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63500,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
 '2142',1201,71900,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,71900,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107187 b/src/main/res-current/raw/current_gtfs_schedule_stop_107187
index 3d022b422..2760b82e4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107187
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107187
@@ -1,9 +1,5 @@
-'1653',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63500,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',100,55300,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,1200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2357',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2358',100,55300,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63500,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',1201,71900,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,71900,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107188 b/src/main/res-current/raw/current_gtfs_schedule_stop_107188
index 693b43e33..6be078e6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107188
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107188
@@ -1,9 +1,5 @@
-'1653',100,63300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63600,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',100,55400,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,1200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2357',100,63300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2358',100,55400,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63600,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',1201,72000,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,72000,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107189 b/src/main/res-current/raw/current_gtfs_schedule_stop_107189
index e61741764..35c852dfd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107189
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107189
@@ -1,9 +1,5 @@
-'1653',100,63400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,63400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63700,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',100,55500,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,1200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
 '2144',100,63400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2357',100,63400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
-'2358',100,55500,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63700,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
 '2142',1201,72100,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,72100,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107190 b/src/main/res-current/raw/current_gtfs_schedule_stop_107190
index a71de10c5..bd86ebc86 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107190
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107190
@@ -1,18 +1,10 @@
-'1653',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0,3300,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
-'1653',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
+'1349',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0,3300,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'1349',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
 '2107',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
 '2107',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',100,55600,4,'',0,8200,4,'',0,7100,4,'',0,3200,4,'',0,6200,4,'',0,2100,4,'',0,800,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,6100,4,'',0,1200,4,'',0,1000,4,'',0,2000,4,'',0,6600,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,2600,4,'',0,6700,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2400,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
 '2142',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
 '2144',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
-'2357',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',100,55600,4,'',0,8200,4,'',0,7100,4,'',0,3200,4,'',0,6200,4,'',0,2100,4,'',0,800,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,6100,4,'',0,1500,4,'',0,800,4,'',0,2000,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,1500,4,'',0,1000,4,'',0,6600,4,'',0,2600,4,'',0,6700,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2500,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
-'2358',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
-'2363',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,72400,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
 '2142',1201,72200,4,'',0,3500,4,'',0,8000,4,'',0,7800,4,'',0,3800,4,'',0,7300,4,'',0,11700,4,'',0,11600,4,'',0,15600,4,'',0,13900,4,'',0,7200,4,'',0,8000,4,'',0,3200,4,'',0
-'2358',1200,72400,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,72200,4,'',0,3500,4,'',0,8000,4,'',0,7800,4,'',0,3800,4,'',0,7300,4,'',0,11700,4,'',0,11600,4,'',0,15600,4,'',0,13900,4,'',0,7200,4,'',0,8000,4,'',0,3200,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107191 b/src/main/res-current/raw/current_gtfs_schedule_stop_107191
index 6f44c9b03..57c1db00d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107191
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107191
@@ -1,12 +1,7 @@
-'1653',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'1653',701,63800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
+'1349',701,63800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
 '2107',701,64000,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2144',701,63800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2363',701,64000,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107192 b/src/main/res-current/raw/current_gtfs_schedule_stop_107192
index f22a2596d..502b54fc4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107192
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107192
@@ -1,12 +1,7 @@
-'1653',100,62300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62600,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54300,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5900,0,'UFV',0
-'2357',100,62300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5900,0,'UFV',0
-'2358',100,54300,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62600,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',700,60200,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60200,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60200,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60200,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60200,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60200,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107193 b/src/main/res-current/raw/current_gtfs_schedule_stop_107193
index 5e917deac..7381c0bba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107193
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107193
@@ -1,12 +1,7 @@
-'1653',100,62400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62700,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54400,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54400,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62700,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',700,60300,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60300,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60300,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60300,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60300,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60300,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107194 b/src/main/res-current/raw/current_gtfs_schedule_stop_107194
index dfeb2366e..6c7df3921 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107194
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107194
@@ -1,12 +1,7 @@
-'1653',100,62500,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62500,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62800,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54500,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62500,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62500,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54500,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62800,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',700,60400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60400,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,14100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60400,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107195 b/src/main/res-current/raw/current_gtfs_schedule_stop_107195
index e04d1de74..3507e9015 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107195
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107195
@@ -1,9 +1,5 @@
-'1653',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
+'1349',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
 '2107',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,72500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107196 b/src/main/res-current/raw/current_gtfs_schedule_stop_107196
index fef09f92b..906ba31cf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107196
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107196
@@ -1,9 +1,5 @@
-'1653',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
+'1349',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
 '2107',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107197 b/src/main/res-current/raw/current_gtfs_schedule_stop_107197
index 15955c65f..9f1f8df7d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107197
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107197
@@ -1,9 +1,5 @@
-'1653',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
+'1349',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
 '2107',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107198 b/src/main/res-current/raw/current_gtfs_schedule_stop_107198
index 5fb0cc652..675c5b879 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107198
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107198
@@ -1,9 +1,5 @@
-'1653',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
+'1349',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,0,'Montrose Exch Only',0
 '2107',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,73400,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73400,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107199 b/src/main/res-current/raw/current_gtfs_schedule_stop_107199
index 51a55320b..15d6ca05d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107199
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107199
@@ -1,12 +1,7 @@
-'1653',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107200 b/src/main/res-current/raw/current_gtfs_schedule_stop_107200
index 23ee04707..9ab41928a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107200
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107200
@@ -1,7 +1,4 @@
-'1653',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107201 b/src/main/res-current/raw/current_gtfs_schedule_stop_107201
index 2d025e627..5c138ff3f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107201
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107201
@@ -1,12 +1,7 @@
-'1653',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'1653',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
+'1349',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
 '2107',701,63800,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2144',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2363',701,63800,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107202 b/src/main/res-current/raw/current_gtfs_schedule_stop_107202
index 5b83f9117..197cf4beb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107202
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107202
@@ -1,12 +1,7 @@
-'1653',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'1653',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
+'1349',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
 '2107',701,63800,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2144',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2363',701,63800,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107203 b/src/main/res-current/raw/current_gtfs_schedule_stop_107203
index 6e832a7db..14073aafc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107203
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107203
@@ -1,12 +1,7 @@
-'1653',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'1653',701,63700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
+'1349',701,63700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0
 '2107',701,63900,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2144',701,63700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2363',701,63900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107204 b/src/main/res-current/raw/current_gtfs_schedule_stop_107204
index de4fbf1aa..750c06fda 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107204
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107204
@@ -1,7 +1,4 @@
-'1653',301,62900,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62900,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,60100,,'',0,5000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62900,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60100,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107205 b/src/main/res-current/raw/current_gtfs_schedule_stop_107205
index 98d6edcc5..a6a799466 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107205
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107205
@@ -1,7 +1,4 @@
-'1653',301,63000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,60200,,'',0,5000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,63000,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60200,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107206 b/src/main/res-current/raw/current_gtfs_schedule_stop_107206
index bc48f60f6..4f0a80606 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107206
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107206
@@ -1,7 +1,4 @@
-'1653',301,63000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65100,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60200,,'',0,5100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63000,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60200,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107207 b/src/main/res-current/raw/current_gtfs_schedule_stop_107207
index 672f875c3..b177e3f74 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107207
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107207
@@ -1,7 +1,4 @@
-'1653',301,63100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,60300,,'',0,5000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,63100,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60300,,'',0,5200,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107208 b/src/main/res-current/raw/current_gtfs_schedule_stop_107208
index 9a7108189..c946647e9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107208
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107208
@@ -1,16 +1,8 @@
-'1653',301,63100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65200,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60300,,'',0,5100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60300,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61900,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61100,,'',0,4600,,'',0,7200,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91400,,'',0,4000,,'',0
-'2361',601,91400,,'',0,4000,,'',0
-'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107209 b/src/main/res-current/raw/current_gtfs_schedule_stop_107209
index 59d272a6d..fd6409926 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107209
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107209
@@ -1,16 +1,8 @@
-'1653',301,63200,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63200,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65300,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60400,,'',0,5100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63200,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60400,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,61600,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61600,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61900,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61100,,'',0,4600,,'',0,7200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61600,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,61100,,'',0,4800,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91500,,'',0,4000,,'',0
-'2361',601,91500,,'',0,4000,,'',0
-'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107210 b/src/main/res-current/raw/current_gtfs_schedule_stop_107210
index 9956888e8..3b7335c6c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107210
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107210
@@ -1,16 +1,8 @@
-'1653',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60500,,'',0,5100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60500,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,61700,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61700,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62000,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61200,,'',0,4600,,'',0,7200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61700,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,8900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,61200,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91600,,'',0,4000,,'',0
-'2361',601,91600,,'',0,4000,,'',0
-'2363',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107211 b/src/main/res-current/raw/current_gtfs_schedule_stop_107211
index 155da95da..4f3e1bc03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107211
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107211
@@ -1,7 +1,4 @@
-'1653',300,63200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',300,63200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
 '2107',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,54500,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,63200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',300,54400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107213 b/src/main/res-current/raw/current_gtfs_schedule_stop_107213
index 93f01f5a2..66152f311 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107213
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107213
@@ -1,16 +1,9 @@
-'1653',301,63600,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63600,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60800,,'',0,5100,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4400,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63600,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2358',301,60800,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64400,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61400,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,61100,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',2400,142900,0,'Ctr Loop',0
-'2358',2400,142900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107214 b/src/main/res-current/raw/current_gtfs_schedule_stop_107214
index f5942bd74..bb390534e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107214
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107214
@@ -1,30 +1,17 @@
-'1653',300,63000,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
-'1653',301,63700,4,'',0,10700,4,'',0,10100,4,'',0,9600,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,5300,4,'',0,9000,4,'',0,9800,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',300,63000,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9400,0,'Bourquin Exch Only',0
+'1349',301,63700,4,'',0,10700,4,'',0,10100,4,'',0,9600,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,5300,4,'',0,9000,4,'',0,9800,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',300,54700,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2107',301,65800,4,'',0,10100,4,'',0,14100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3200,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3400,4,'',0,7200,4,'',0,3500,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,9600,4,'',0,9500,4,'',0
 '2142',300,54300,,'',0,7300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2142',301,60900,4,'',0,9100,4,'',0,3400,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3600,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,7400,4,'',0,3400,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3300,4,'',0,7000,4,'',0,4400,4,'',0,8500,4,'',0,9800,4,'',0
 '2144',300,63000,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
 '2144',301,63700,4,'',0,10700,4,'',0,10100,4,'',0,9600,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,5300,4,'',0,9000,4,'',0,9800,4,'',0,10000,4,'',0
-'2357',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
-'2358',300,54200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2358',301,60900,4,'',0,9300,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7500,4,'',0,7600,4,'',0,3600,4,'',0,7600,4,'',0,3600,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,2900,4,'',0,7300,4,'',0,3500,4,'',0,6700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
-'2363',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2363',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
-'1653',500,63800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',501,62900,4,'',0,10000,4,'',0,9400,4,'',0,9800,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,5400,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9500,4,'',0
+'1349',500,63800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',501,62900,4,'',0,10000,4,'',0,9400,4,'',0,9800,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,5400,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9500,4,'',0
 '2107',500,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2107',501,64500,4,'',0,9700,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,7300,4,'',0,3300,4,'',0,7600,4,'',0,3200,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9600,4,'',0,9700,4,'',0,9400,4,'',0
 '2142',500,61000,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2142',501,61500,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7600,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3300,4,'',0,7400,4,'',0,3700,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7800,4,'',0,3600,4,'',0,7500,4,'',0,3100,4,'',0,8500,4,'',0,8500,4,'',0,10000,4,'',0,9500,4,'',0
 '2144',500,63800,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
 '2144',501,62900,4,'',0,10000,4,'',0,9400,4,'',0,9800,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,5400,4,'',0,9000,4,'',0,9100,4,'',0,9600,4,'',0,9000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0
-'2357',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2357',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2358',500,60900,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2358',501,61200,4,'',0,2900,4,'',0,6800,4,'',0,2800,4,'',0,7600,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7800,4,'',0,3100,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
-'2363',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2363',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
 '2142',2400,143000,0,'Ctr Loop',0
-'2358',2400,143000,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107215 b/src/main/res-current/raw/current_gtfs_schedule_stop_107215
index 06df3672e..fc7440fdd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107215
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107215
@@ -1,18 +1,10 @@
-'1653',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90000,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61800,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'1653',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107216 b/src/main/res-current/raw/current_gtfs_schedule_stop_107216
index 23e6d730b..80cfdf333 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107216
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107216
@@ -1,11 +1,6 @@
-'1653',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60700,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60700,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61800,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107217 b/src/main/res-current/raw/current_gtfs_schedule_stop_107217
index cbdbd4b41..cd405eb7d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107217
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107217
@@ -1,11 +1,6 @@
-'1653',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60800,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60800,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61900,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61800,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107218 b/src/main/res-current/raw/current_gtfs_schedule_stop_107218
index 5171226e7..458852224 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107218
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107218
@@ -1,11 +1,6 @@
-'1653',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60800,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60800,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90200,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61900,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61800,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107219 b/src/main/res-current/raw/current_gtfs_schedule_stop_107219
index 214d33cd3..9a766182b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107219
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107219
@@ -1,11 +1,6 @@
-'1653',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60900,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60900,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90200,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,61900,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61800,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107220 b/src/main/res-current/raw/current_gtfs_schedule_stop_107220
index 202e213b0..3d52c7eda 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107220
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107220
@@ -1,11 +1,6 @@
-'1653',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,60900,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,60900,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90300,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62000,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,61900,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107221 b/src/main/res-current/raw/current_gtfs_schedule_stop_107221
index 8fc207fd1..a80274b78 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107221
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107221
@@ -1,11 +1,6 @@
-'1653',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61000,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61000,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1501,90300,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62000,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'2358',1501,61900,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'2363',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107222 b/src/main/res-current/raw/current_gtfs_schedule_stop_107222
index 61b99b748..c1498315a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107222
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107222
@@ -1,10 +1,6 @@
-'1653',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,143400,0,'Sandy Hl',0
 '2142',2601,75900,0,'Sandy Hl',0
-'2358',2601,75900,0,'Sandy Hl',0,67500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107223 b/src/main/res-current/raw/current_gtfs_schedule_stop_107223
index b8bb82f10..5dff2a588 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107223
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107223
@@ -1,10 +1,6 @@
-'1653',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,143500,0,'Sandy Hl',0
 '2142',2601,80000,0,'Sandy Hl',0
-'2358',2601,80000,0,'Sandy Hl',0,63500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107224 b/src/main/res-current/raw/current_gtfs_schedule_stop_107224
index cf613184b..5f95330a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107224
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107224
@@ -1,7 +1,4 @@
-'1653',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107225 b/src/main/res-current/raw/current_gtfs_schedule_stop_107225
index 6633bd81a..67904f291 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107225
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107225
@@ -1,7 +1,4 @@
-'1653',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61200,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61200,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107226 b/src/main/res-current/raw/current_gtfs_schedule_stop_107226
index 4109841dd..048faf042 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107226
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107226
@@ -1,7 +1,4 @@
-'1653',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107227 b/src/main/res-current/raw/current_gtfs_schedule_stop_107227
index 8b9fb317a..7315ec915 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107227
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107227
@@ -1,7 +1,4 @@
-'1653',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,13000,,'',0,17500,,'',0
+'1349',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,13000,,'',0,17500,,'',0
 '2107',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107228 b/src/main/res-current/raw/current_gtfs_schedule_stop_107228
index 16b3bf831..c75d1104d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107228
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107228
@@ -1,10 +1,6 @@
-'1653',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61400,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61400,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',2600,143900,0,'Sandy Hl',0
 '2142',2601,80300,0,'Sandy Hl',0
-'2358',2601,80300,0,'Sandy Hl',0,63600,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107229 b/src/main/res-current/raw/current_gtfs_schedule_stop_107229
index 71338e876..9d610a413 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107229
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107229
@@ -1,7 +1,4 @@
-'1653',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107230 b/src/main/res-current/raw/current_gtfs_schedule_stop_107230
index 28e5d08b5..e72fd6468 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107230
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107230
@@ -1,7 +1,4 @@
-'1653',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107231 b/src/main/res-current/raw/current_gtfs_schedule_stop_107231
index 91a8371aa..8631c467c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107231
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107231
@@ -1,7 +1,4 @@
-'1653',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107232 b/src/main/res-current/raw/current_gtfs_schedule_stop_107232
index 80ab0a225..f4523c9aa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107232
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107232
@@ -1,7 +1,4 @@
-'1653',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
 '2144',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2363',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107234 b/src/main/res-current/raw/current_gtfs_schedule_stop_107234
index 02e714032..ad6fb499e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107234
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107234
@@ -1,7 +1,4 @@
-'1653',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107235 b/src/main/res-current/raw/current_gtfs_schedule_stop_107235
index 112a1a9b9..c434a5d22 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107235
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107235
@@ -1,7 +1,4 @@
-'1653',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107236 b/src/main/res-current/raw/current_gtfs_schedule_stop_107236
index 4f3b9c1db..fb0e2fa4c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107236
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107236
@@ -1,7 +1,4 @@
-'1653',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107237 b/src/main/res-current/raw/current_gtfs_schedule_stop_107237
index 291f726cb..371989bb1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107237
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107237
@@ -1,7 +1,4 @@
-'1653',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107238 b/src/main/res-current/raw/current_gtfs_schedule_stop_107238
index ed6c9cc38..601e97164 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107238
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107238
@@ -1,7 +1,4 @@
-'1653',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107239 b/src/main/res-current/raw/current_gtfs_schedule_stop_107239
index ed6c9cc38..601e97164 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107239
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107239
@@ -1,7 +1,4 @@
-'1653',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107240 b/src/main/res-current/raw/current_gtfs_schedule_stop_107240
index 9a01b6fd0..2fd4dfddb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107240
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107240
@@ -1,7 +1,4 @@
-'1653',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107241 b/src/main/res-current/raw/current_gtfs_schedule_stop_107241
index b3b4af96b..24a0d770e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107241
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107241
@@ -1,7 +1,4 @@
-'1653',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107242 b/src/main/res-current/raw/current_gtfs_schedule_stop_107242
index 7f7922260..0eddaf52f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107242
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107242
@@ -1,7 +1,4 @@
-'1653',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107243 b/src/main/res-current/raw/current_gtfs_schedule_stop_107243
index 7f7922260..0eddaf52f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107243
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107243
@@ -1,7 +1,4 @@
-'1653',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107244 b/src/main/res-current/raw/current_gtfs_schedule_stop_107244
index efc4d82e5..7e198816c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107244
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107244
@@ -1,7 +1,4 @@
-'1653',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107245 b/src/main/res-current/raw/current_gtfs_schedule_stop_107245
index efc4d82e5..7e198816c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107245
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107245
@@ -1,7 +1,4 @@
-'1653',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107246 b/src/main/res-current/raw/current_gtfs_schedule_stop_107246
index 481cd5821..7a2a519bb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107246
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107246
@@ -1,7 +1,4 @@
-'1653',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107247 b/src/main/res-current/raw/current_gtfs_schedule_stop_107247
index 298b23e60..b5d7d719b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107247
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107247
@@ -1,10 +1,6 @@
-'1653',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2142',2600,144600,0,'Montrose Exch Only',0
+'2142',2600,144600,,'',0
 '2142',2601,81000,,'',0
-'2358',2600,81000,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107248 b/src/main/res-current/raw/current_gtfs_schedule_stop_107248
index c52a5e944..fa0982f65 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107248
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107248
@@ -1,10 +1,6 @@
-'1653',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2142',2600,144700,0,'Montrose Exch Only',0
+'2142',2600,144700,,'',0
 '2142',2601,81100,,'',0
-'2358',2600,81100,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107249 b/src/main/res-current/raw/current_gtfs_schedule_stop_107249
index 9c2b316bf..31b4d112a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107249
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107249
@@ -1,11 +1,6 @@
-'1653',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,63000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
-'2357',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
-'2358',400,63000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1500,93000,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64600,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107250 b/src/main/res-current/raw/current_gtfs_schedule_stop_107250
index 3577e925c..7d67ea9c8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107250
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107250
@@ -1,11 +1,6 @@
-'1653',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,63100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
 '2144',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'2363',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',1500,93000,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64600,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64700,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107251 b/src/main/res-current/raw/current_gtfs_schedule_stop_107251
index 266137b58..09c076951 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107251
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107251
@@ -1,11 +1,6 @@
-'1653',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2142',400,63200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
 '2144',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'2363',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2107',1500,93100,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64700,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107252 b/src/main/res-current/raw/current_gtfs_schedule_stop_107252
index 5ca518e55..a2ff4771b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107252
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107252
@@ -1,11 +1,6 @@
-'1653',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2142',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
 '2144',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'2363',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2107',1500,93100,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64700,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64800,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107253 b/src/main/res-current/raw/current_gtfs_schedule_stop_107253
index 7e2d8f148..3b97f3939 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107253
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107253
@@ -1,11 +1,6 @@
-'1653',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2142',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2107',1500,93200,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64800,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107254 b/src/main/res-current/raw/current_gtfs_schedule_stop_107254
index 988bf48f6..c43572052 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107254
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107254
@@ -1,18 +1,10 @@
-'1653',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2142',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
 '2144',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'2363',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
 '2107',1500,93200,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64800,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
-'1653',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107255 b/src/main/res-current/raw/current_gtfs_schedule_stop_107255
index f33d41108..9a000336f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107255
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107255
@@ -1,7 +1,4 @@
-'1653',3101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64400,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,64400,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107256 b/src/main/res-current/raw/current_gtfs_schedule_stop_107256
index 618ca2f18..2b8f8a3bd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107256
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107256
@@ -1,7 +1,4 @@
-'1653',3101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,83200,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3300,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,64300,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,7700,,'',0,3800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1400,,'',0,5500,,'',0,1300,,'',0,1700,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
 '2144',3101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,64300,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,7700,,'',0,3800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1400,,'',0,5500,,'',0,1300,,'',0,1700,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
-'2363',3101,83200,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3300,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107257 b/src/main/res-current/raw/current_gtfs_schedule_stop_107257
index 04f9fdc95..883054908 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107257
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107257
@@ -1,21 +1,11 @@
-'1653',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52700,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
 '2144',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,103300,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103300,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
+'1349',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0
 '2107',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2144',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2363',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',2601,82400,,'',0
-'2358',2600,82400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107258 b/src/main/res-current/raw/current_gtfs_schedule_stop_107258
index b9e6e2622..865b381be 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107258
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107258
@@ -1,9 +1,5 @@
-'1653',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63700,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2142',1201,71500,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71500,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107259 b/src/main/res-current/raw/current_gtfs_schedule_stop_107259
index 706c97b87..d65177e5f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107259
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107259
@@ -1,9 +1,5 @@
-'1653',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63700,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,62100,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
 '2142',1201,71500,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71500,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107260 b/src/main/res-current/raw/current_gtfs_schedule_stop_107260
index 8138a1c54..d837eae85 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107260
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107260
@@ -1,7 +1,4 @@
-'1653',501,62100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63700,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60600,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62100,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107261 b/src/main/res-current/raw/current_gtfs_schedule_stop_107261
index 90c665163..0b8b4c758 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107261
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107261
@@ -1,7 +1,4 @@
-'1653',501,62200,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62200,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63800,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,62200,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60500,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107262 b/src/main/res-current/raw/current_gtfs_schedule_stop_107262
index 031fb3123..463c417d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107262
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107262
@@ -1,7 +1,4 @@
-'1653',501,62200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63800,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60700,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62200,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107263 b/src/main/res-current/raw/current_gtfs_schedule_stop_107263
index fd1b5ca2f..1d71dda3e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107263
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107263
@@ -1,7 +1,4 @@
-'1653',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107264 b/src/main/res-current/raw/current_gtfs_schedule_stop_107264
index 91c687c28..377736c74 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107264
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107264
@@ -1,7 +1,4 @@
-'1653',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63900,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62300,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107265 b/src/main/res-current/raw/current_gtfs_schedule_stop_107265
index ba4868b34..434640527 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107265
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107265
@@ -1,7 +1,4 @@
-'1653',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64000,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,60900,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60800,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107267 b/src/main/res-current/raw/current_gtfs_schedule_stop_107267
index 176e1c6a7..339b64e19 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107267
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107267
@@ -1,7 +1,4 @@
-'1653',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64100,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61000,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60800,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107268 b/src/main/res-current/raw/current_gtfs_schedule_stop_107268
index 164162bff..9f14b5b3c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107268
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107268
@@ -1,7 +1,4 @@
-'1653',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64100,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61100,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62500,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60900,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107270 b/src/main/res-current/raw/current_gtfs_schedule_stop_107270
index e91ac5d75..020876287 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107270
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107270
@@ -1,7 +1,4 @@
-'1653',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64300,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61200,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,61000,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107271 b/src/main/res-current/raw/current_gtfs_schedule_stop_107271
index 4f86b92ba..cfe82d93a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107271
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107271
@@ -1,7 +1,4 @@
-'1653',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64300,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62700,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,61000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107272 b/src/main/res-current/raw/current_gtfs_schedule_stop_107272
index dc400b2a4..9dbcefe43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107272
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107272
@@ -1,7 +1,4 @@
-'1653',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64400,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61300,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62800,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,8900,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,61100,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107273 b/src/main/res-current/raw/current_gtfs_schedule_stop_107273
index 88c06d3bc..e99b019c9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107273
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107273
@@ -1,22 +1,10 @@
-'1653',601,61900,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61900,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62200,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61400,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,61900,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2358',601,61400,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,91800,,'',0,4000,,'',0
-'2361',601,91800,,'',0,4000,,'',0
-'2363',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',1701,63200,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63200,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81400,,'',0,12700,,'',0,16700,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60300,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,15900,,'',0,11200,,'',0
 '2144',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,60600,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72500,,'',0
-'2361',2101,72500,,'',0
-'2363',2101,74300,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
 '2142',2401,80100,0,'Ctr Loop',0
-'2358',2401,80100,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107274 b/src/main/res-current/raw/current_gtfs_schedule_stop_107274
index 4f537cd34..4cc7f6697 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107274
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107274
@@ -1,22 +1,10 @@
-'1653',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11800,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11800,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62200,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61500,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11800,,'',0,16000,,'',0
-'2357',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,91900,,'',0,4000,,'',0
-'2361',601,91900,,'',0,4000,,'',0
-'2363',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',1701,63300,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63300,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81400,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,60300,,'',0,3900,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,15800,,'',0,11200,,'',0
 '2144',2101,90700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,60700,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72600,,'',0
-'2361',2101,72600,,'',0
-'2363',2101,74300,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
 '2142',2401,80200,0,'Ctr Loop',0
-'2358',2401,80200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107275 b/src/main/res-current/raw/current_gtfs_schedule_stop_107275
index d8ac1e961..e9026b2ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107275
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107275
@@ -1,11 +1,5 @@
 '2142',1701,63300,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63300,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81500,,'',0,12700,,'',0,16700,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60400,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,10400,,'',0,15900,,'',0,11200,,'',0
 '2144',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,60700,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72600,,'',0
-'2361',2101,72600,,'',0
-'2363',2101,74400,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107276 b/src/main/res-current/raw/current_gtfs_schedule_stop_107276
index a6de2aaab..6b4f37d37 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107276
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107276
@@ -1,11 +1,5 @@
 '2142',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7500,,'',0
-'2358',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
-'1653',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91400,,'',0,11100,,'',0,12800,,'',0,18600,,'',0,17100,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65500,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15900,,'',0,13300,,'',0,7700,,'',0,9600,,'',0,3200,,'',0,9700,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65200,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9400,,'',0,15600,,'',0,11000,,'',0
-'2360',2100,82000,,'',0
-'2361',2100,82000,,'',0
-'2363',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107277 b/src/main/res-current/raw/current_gtfs_schedule_stop_107277
index 2f0580f06..4e86a1e29 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107277
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107277
@@ -1,11 +1,5 @@
-'1653',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62300,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61500,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62000,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0
-'2357',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2358',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,91900,,'',0,4000,,'',0
-'2361',601,91900,,'',0,4000,,'',0
-'2363',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,80200,0,'Ctr Loop',0
-'2358',2401,80200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107278 b/src/main/res-current/raw/current_gtfs_schedule_stop_107278
index 73fc4a967..875af02fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107278
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107278
@@ -1,11 +1,5 @@
-'1653',601,62100,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62100,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62400,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61600,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62100,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15900,,'',0,12000,,'',0
-'2357',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2358',601,61600,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92000,,'',0,8000,,'',0
-'2361',601,92000,,'',0,8000,,'',0
-'2363',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,80300,0,'Ctr Loop',0
-'2358',2401,80300,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107279 b/src/main/res-current/raw/current_gtfs_schedule_stop_107279
index a77ee2dc6..ec75f7bcc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107279
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107279
@@ -1,7 +1,4 @@
-'1653',500,64100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61300,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64100,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2358',500,61200,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107280 b/src/main/res-current/raw/current_gtfs_schedule_stop_107280
index 75441961c..cbaec4d38 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107280
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107280
@@ -1,7 +1,4 @@
-'1653',500,64100,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64100,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61400,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64100,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61300,,'',0,9300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107282 b/src/main/res-current/raw/current_gtfs_schedule_stop_107282
index 3d9bd042a..eedf4fca5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107282
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107282
@@ -1,7 +1,4 @@
-'1653',500,64300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7400,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61500,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64300,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2357',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2358',500,61400,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107283 b/src/main/res-current/raw/current_gtfs_schedule_stop_107283
index 98774dc66..7438a3934 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107283
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107283
@@ -1,7 +1,4 @@
-'1653',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61700,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61600,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107284 b/src/main/res-current/raw/current_gtfs_schedule_stop_107284
index f2725497c..07954bdaf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107284
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107284
@@ -1,7 +1,4 @@
-'1653',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61700,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64400,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61600,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107285 b/src/main/res-current/raw/current_gtfs_schedule_stop_107285
index a1146b9eb..c2614cbd9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107285
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107285
@@ -1,7 +1,4 @@
-'1653',500,64500,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64500,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61800,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64500,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61700,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107286 b/src/main/res-current/raw/current_gtfs_schedule_stop_107286
index 156ac3fdb..e5d4f9984 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107286
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107286
@@ -1,9 +1,5 @@
-'1653',500,64600,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64600,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61900,,'',0,9200,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64600,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61800,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
 '2142',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'2358',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107287 b/src/main/res-current/raw/current_gtfs_schedule_stop_107287
index 417e8479c..3527dfe5c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107287
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107287
@@ -1,9 +1,5 @@
-'1653',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2800,,'',0,6900,,'',0,5600,,'',0
 '2142',500,62000,,'',0,9200,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,7400,,'',0,3700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64700,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61900,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
 '2142',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'2358',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107288 b/src/main/res-current/raw/current_gtfs_schedule_stop_107288
index 637345d3a..01b6e4063 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107288
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107288
@@ -1,11 +1,5 @@
-'1653',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60700,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55800,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55800,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85900,,'',0,8000,,'',0
-'2361',601,85900,,'',0,8000,,'',0
-'2363',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74300,0,'Ctr Loop',0
-'2358',2401,74300,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107289 b/src/main/res-current/raw/current_gtfs_schedule_stop_107289
index 484277b4d..3b46bba07 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107289
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107289
@@ -1,11 +1,5 @@
-'1653',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60700,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55800,,'',0,8600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3900,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55800,,'',0,8600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,27500,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'2360',601,90000,,'',0,4000,,'',0
-'2361',601,90000,,'',0,4000,,'',0
-'2363',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74400,0,'Ctr Loop',0
-'2358',2401,74400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107290 b/src/main/res-current/raw/current_gtfs_schedule_stop_107290
index 7272a9b6e..a1e52ac4d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107290
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107290
@@ -1,11 +1,5 @@
-'1653',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60800,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55900,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55900,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90000,,'',0,4000,,'',0
-'2361',601,90000,,'',0,4000,,'',0
-'2363',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74400,0,'Ctr Loop',0
-'2358',2401,74400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107291 b/src/main/res-current/raw/current_gtfs_schedule_stop_107291
index 770894f23..7b2b9396f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107291
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107291
@@ -1,11 +1,5 @@
-'1653',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60800,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55900,,'',0,8600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55900,,'',0,8600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90100,,'',0,4000,,'',0
-'2361',601,90100,,'',0,4000,,'',0
-'2363',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74500,0,'Ctr Loop',0
-'2358',2401,74500,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107292 b/src/main/res-current/raw/current_gtfs_schedule_stop_107292
index f8ed342d1..d9486e5c9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107292
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107292
@@ -1,11 +1,5 @@
-'1653',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60900,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90200,,'',0,4000,,'',0
-'2361',601,90200,,'',0,4000,,'',0
-'2363',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74600,0,'Ctr Loop',0
-'2358',2401,74600,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107293 b/src/main/res-current/raw/current_gtfs_schedule_stop_107293
index f8ed342d1..d9486e5c9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107293
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107293
@@ -1,11 +1,5 @@
-'1653',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60900,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90200,,'',0,4000,,'',0
-'2361',601,90200,,'',0,4000,,'',0
-'2363',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74600,0,'Ctr Loop',0
-'2358',2401,74600,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107294 b/src/main/res-current/raw/current_gtfs_schedule_stop_107294
index 7e1397d6c..f3e79cb17 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107294
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107294
@@ -1,11 +1,5 @@
-'1653',601,60600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61000,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60100,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60100,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90300,,'',0,4000,,'',0
-'2361',601,90300,,'',0,4000,,'',0
-'2363',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74700,0,'Ctr Loop',0
-'2358',2401,74700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107295 b/src/main/res-current/raw/current_gtfs_schedule_stop_107295
index 75b32a40c..9dc0d3295 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107295
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107295
@@ -1,11 +1,5 @@
-'1653',601,60700,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60700,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61100,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60200,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60700,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60200,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90400,,'',0,4000,,'',0
-'2361',601,90400,,'',0,4000,,'',0
-'2363',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74800,0,'Ctr Loop',0
-'2358',2401,74800,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107296 b/src/main/res-current/raw/current_gtfs_schedule_stop_107296
index a1a1d3401..3ffecff8b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107296
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107296
@@ -1,11 +1,5 @@
-'1653',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61100,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60300,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60300,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90500,,'',0,4000,,'',0
-'2361',601,90500,,'',0,4000,,'',0
-'2363',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74900,0,'Ctr Loop',0
-'2358',2401,74900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107297 b/src/main/res-current/raw/current_gtfs_schedule_stop_107297
index ffb230b29..7dea6e622 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107297
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107297
@@ -1,11 +1,5 @@
-'1653',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61200,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60300,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60800,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60300,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90500,,'',0,4000,,'',0
-'2361',601,90500,,'',0,4000,,'',0
-'2363',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,74900,0,'Ctr Loop',0
-'2358',2401,74900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107298 b/src/main/res-current/raw/current_gtfs_schedule_stop_107298
index 26a2542bf..8e00001f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107298
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107298
@@ -1,11 +1,5 @@
-'1653',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61200,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2142',601,60400,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60400,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90600,,'',0,4000,,'',0
-'2361',601,90600,,'',0,4000,,'',0
-'2363',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
 '2142',2401,75000,0,'Ctr Loop',0
-'2358',2401,75000,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107299 b/src/main/res-current/raw/current_gtfs_schedule_stop_107299
index f073d253b..49fb4b131 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107299
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107299
@@ -1,11 +1,5 @@
-'1653',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61300,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60400,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,60900,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,60400,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90600,,'',0,4000,,'',0
-'2361',601,90600,,'',0,4000,,'',0
-'2363',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75000,0,'Ctr Loop',0
-'2358',2401,75000,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107300 b/src/main/res-current/raw/current_gtfs_schedule_stop_107300
index 71bfea186..c0c9acd3d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107300
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107300
@@ -1,11 +1,5 @@
-'1653',601,61000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61300,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60500,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60500,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90700,,'',0,4000,,'',0
-'2361',601,90700,,'',0,4000,,'',0
-'2363',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75100,0,'Ctr Loop',0
-'2358',2401,75100,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107301 b/src/main/res-current/raw/current_gtfs_schedule_stop_107301
index 00d2934cb..8600920f3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107301
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107301
@@ -1,11 +1,5 @@
-'1653',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61400,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90800,,'',0,4000,,'',0
-'2361',601,90800,,'',0,4000,,'',0
-'2363',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75200,0,'Ctr Loop',0
-'2358',2401,75200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107302 b/src/main/res-current/raw/current_gtfs_schedule_stop_107302
index 00d2934cb..8600920f3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107302
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107302
@@ -1,11 +1,5 @@
-'1653',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61400,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61100,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,5600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90800,,'',0,4000,,'',0
-'2361',601,90800,,'',0,4000,,'',0
-'2363',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75200,0,'Ctr Loop',0
-'2358',2401,75200,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107303 b/src/main/res-current/raw/current_gtfs_schedule_stop_107303
index 3e54810a7..5ce4c67f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107303
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107303
@@ -1,11 +1,5 @@
-'1653',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61500,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60700,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60700,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,90900,,'',0,4000,,'',0
-'2361',601,90900,,'',0,4000,,'',0
-'2363',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75300,0,'Ctr Loop',0
-'2358',2401,75300,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107304 b/src/main/res-current/raw/current_gtfs_schedule_stop_107304
index 5681d7099..8eb8889ab 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107304
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107304
@@ -1,11 +1,5 @@
-'1653',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61500,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10400,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60700,,'',0,4600,,'',0,7200,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61200,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,60700,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8200,,'',0,9000,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91000,,'',0,4000,,'',0
-'2361',601,91000,,'',0,4000,,'',0
-'2363',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75400,0,'Ctr Loop',0
-'2358',2401,75400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107305 b/src/main/res-current/raw/current_gtfs_schedule_stop_107305
index 42a1cf550..cf94cfee1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107305
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107305
@@ -1,11 +1,5 @@
-'1653',601,61300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61600,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60800,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61300,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60800,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8300,,'',0,8900,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91000,,'',0,4000,,'',0
-'2361',601,91000,,'',0,4000,,'',0
-'2363',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75400,0,'Ctr Loop',0
-'2358',2401,75400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107306 b/src/main/res-current/raw/current_gtfs_schedule_stop_107306
index a00f776fa..418feabbd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107306
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107306
@@ -1,11 +1,5 @@
-'1653',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61700,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,14600,,'',0,10500,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60900,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3900,,'',0,15500,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
-'2358',601,60900,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91100,,'',0,4000,,'',0
-'2361',601,91100,,'',0,4000,,'',0
-'2363',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75500,0,'Ctr Loop',0
-'2358',2401,75500,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107307 b/src/main/res-current/raw/current_gtfs_schedule_stop_107307
index 021029a2b..f302b8bb4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107307
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107307
@@ -1,11 +1,5 @@
-'1653',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61700,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,60900,,'',0,4600,,'',0,7200,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61400,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,60900,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91200,,'',0,4000,,'',0
-'2361',601,91200,,'',0,4000,,'',0
-'2363',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,75600,0,'Ctr Loop',0
-'2358',2401,75600,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107308 b/src/main/res-current/raw/current_gtfs_schedule_stop_107308
index 95dce6e59..675fbe9fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107308
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107308
@@ -1,15 +1,6 @@
-'1653',601,61500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61800,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61000,,'',0,4600,,'',0,7200,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61500,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,61000,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91300,,'',0,4000,,'',0
-'2361',601,91300,,'',0,4000,,'',0
-'2363',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2201,84300,,'',0,66800,,'',0
-'2358',2201,151700,,'',0
-'2360',2201,90100,,'',0
-'2361',2201,83100,,'',0
 '2142',2401,75700,0,'Ctr Loop',0
-'2358',2401,75700,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107309 b/src/main/res-current/raw/current_gtfs_schedule_stop_107309
index 5704d8586..85408bf46 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107309
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107309
@@ -1,15 +1,6 @@
-'1653',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,61900,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61100,,'',0,4600,,'',0,7200,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,3800,,'',0,15600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8500,,'',0,11400,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61600,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
-'2358',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91400,,'',0,4000,,'',0
-'2361',601,91400,,'',0,4000,,'',0
-'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2201,84400,,'',0,66800,,'',0
-'2358',2201,151800,,'',0
-'2360',2201,90200,,'',0
-'2361',2201,83200,,'',0
 '2142',2401,75800,0,'Ctr Loop',0
-'2358',2401,75800,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107310 b/src/main/res-current/raw/current_gtfs_schedule_stop_107310
index 20cae6bc2..441938293 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107310
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107310
@@ -1,11 +1,5 @@
-'1653',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62400,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61700,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92100,,'',0,8000,,'',0
-'2361',601,92100,,'',0,8000,,'',0
-'2363',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,80400,0,'Ctr Loop',0
-'2358',2401,80400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107311 b/src/main/res-current/raw/current_gtfs_schedule_stop_107311
index 20cae6bc2..441938293 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107311
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107311
@@ -1,11 +1,5 @@
-'1653',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62400,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61700,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62200,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92100,,'',0,8000,,'',0
-'2361',601,92100,,'',0,8000,,'',0
-'2363',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,80400,0,'Ctr Loop',0
-'2358',2401,80400,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107312 b/src/main/res-current/raw/current_gtfs_schedule_stop_107312
index 00e071ace..fe3fc8f9e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107312
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107312
@@ -1,11 +1,5 @@
-'1653',601,62300,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62300,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62500,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61800,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62300,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61800,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92200,,'',0,8000,,'',0
-'2361',601,92200,,'',0,8000,,'',0
-'2363',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',2401,80500,0,'Ctr Loop',0
-'2358',2401,80500,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107313 b/src/main/res-current/raw/current_gtfs_schedule_stop_107313
index f6e600991..2b7354511 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107313
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107313
@@ -1,9 +1,4 @@
-'1653',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62600,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61900,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92300,,'',0,8000,,'',0
-'2361',601,92300,,'',0,8000,,'',0
-'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107314 b/src/main/res-current/raw/current_gtfs_schedule_stop_107314
index e51f5c5b5..3baa969cc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107314
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107314
@@ -1,9 +1,4 @@
-'1653',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62600,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61900,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8100,,'',0,8400,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62400,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92300,,'',0,8000,,'',0
-'2361',601,92300,,'',0,8000,,'',0
-'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107315 b/src/main/res-current/raw/current_gtfs_schedule_stop_107315
index f2cdb5b63..fb39d5041 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107315
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107315
@@ -1,9 +1,4 @@
-'1653',601,62400,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62400,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62600,,'',0,12000,,'',0,10200,,'',0,10000,,'',0,10600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',601,61900,,'',0,8700,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8100,,'',0,8400,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,10900,,'',0
 '2144',601,62400,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,61900,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'2360',601,92400,,'',0,8000,,'',0
-'2361',601,92400,,'',0,8000,,'',0
-'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107316 b/src/main/res-current/raw/current_gtfs_schedule_stop_107316
index 158288504..0237c222a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107316
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107316
@@ -1,9 +1,4 @@
-'1653',601,62500,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62500,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62700,,'',0,12000,,'',0,10200,,'',0,10000,,'',0,10600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
 '2142',601,62000,,'',0,8700,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8100,,'',0,8400,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,10900,,'',0
 '2144',601,62500,,'',0,13000,,'',0,10100,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,62000,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'2360',601,92500,,'',0,8000,,'',0
-'2361',601,92500,,'',0,8000,,'',0
-'2363',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107317 b/src/main/res-current/raw/current_gtfs_schedule_stop_107317
index c61173b43..eef488f6c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107317
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107317
@@ -1,9 +1,4 @@
-'1653',601,62600,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,62600,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62800,,'',0,12000,,'',0,10200,,'',0,9900,,'',0,10600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,62100,,'',0,8600,,'',0,3200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11700,,'',0,11600,,'',0,11600,,'',0,8600,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,4300,,'',0,15400,,'',0,9900,,'',0,11500,,'',0,11000,,'',0
 '2144',601,62600,,'',0,13000,,'',0,10000,,'',0,14600,,'',0,5100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,15800,,'',0,12000,,'',0
-'2357',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
-'2358',601,62100,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'2360',601,92500,,'',0,8000,,'',0
-'2361',601,92500,,'',0,8000,,'',0
-'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107318 b/src/main/res-current/raw/current_gtfs_schedule_stop_107318
index e12573089..802a7f4a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107318
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107318
@@ -1,9 +1,5 @@
-'1653',700,60700,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60700,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60700,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,60700,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60700,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,62000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,60700,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,73700,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
-'2358',1600,73800,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107319 b/src/main/res-current/raw/current_gtfs_schedule_stop_107319
index 9497939ea..a728c4bcb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107319
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107319
@@ -1,9 +1,5 @@
-'1653',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,73800,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
-'2358',1600,73900,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107320 b/src/main/res-current/raw/current_gtfs_schedule_stop_107320
index cd53a27f5..1ad2c1214 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107320
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107320
@@ -1,9 +1,5 @@
-'1653',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,73800,,'',0,12000,,'',0,68500,,'',0,8500,,'',0
-'2358',1600,73900,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107321 b/src/main/res-current/raw/current_gtfs_schedule_stop_107321
index 4e35f5abd..abb35f37f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107321
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107321
@@ -1,9 +1,5 @@
-'1653',700,61000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62300,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62300,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',1600,74000,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74100,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107322 b/src/main/res-current/raw/current_gtfs_schedule_stop_107322
index 2b4109324..5ec43b494 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107322
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107322
@@ -1,7 +1,4 @@
-'1653',700,61000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107324 b/src/main/res-current/raw/current_gtfs_schedule_stop_107324
index ff9baa712..67c2bd44f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107324
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107324
@@ -1,7 +1,4 @@
-'1653',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107325 b/src/main/res-current/raw/current_gtfs_schedule_stop_107325
index ff9baa712..67c2bd44f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107325
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107325
@@ -1,7 +1,4 @@
-'1653',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107326 b/src/main/res-current/raw/current_gtfs_schedule_stop_107326
index 043380cf3..a9d8d7c76 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107326
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107326
@@ -1,7 +1,4 @@
-'1653',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107327 b/src/main/res-current/raw/current_gtfs_schedule_stop_107327
index bf3a07a7e..66938f82f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107327
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107327
@@ -1,7 +1,4 @@
-'1653',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107328 b/src/main/res-current/raw/current_gtfs_schedule_stop_107328
index 8b81861d9..593f8bb9d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107328
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107328
@@ -1,7 +1,4 @@
-'1653',700,61300,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61300,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61300,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62700,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61300,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61300,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62700,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61300,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107329 b/src/main/res-current/raw/current_gtfs_schedule_stop_107329
index 55f1029cf..c07ff2bbf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107329
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107329
@@ -1,7 +1,4 @@
-'1653',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107330 b/src/main/res-current/raw/current_gtfs_schedule_stop_107330
index 55f1029cf..c07ff2bbf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107330
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107330
@@ -1,7 +1,4 @@
-'1653',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107331 b/src/main/res-current/raw/current_gtfs_schedule_stop_107331
index b333ad667..9e2ceb979 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107331
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107331
@@ -1,9 +1,5 @@
-'1653',700,61500,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61500,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61500,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,62900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61500,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61500,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61500,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',1600,74600,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74700,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107332 b/src/main/res-current/raw/current_gtfs_schedule_stop_107332
index ff56a91f1..a5e38e784 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107332
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107332
@@ -1,9 +1,5 @@
-'1653',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',1600,74700,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74800,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107333 b/src/main/res-current/raw/current_gtfs_schedule_stop_107333
index 2053c3ba7..a5e38e784 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107333
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107333
@@ -1,9 +1,5 @@
-'1653',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',1600,74700,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74900,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107334 b/src/main/res-current/raw/current_gtfs_schedule_stop_107334
index 8b7e3f114..54c182141 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107334
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107334
@@ -1,9 +1,5 @@
-'1653',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
 '2144',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
-'2363',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',1600,74800,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74900,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107335 b/src/main/res-current/raw/current_gtfs_schedule_stop_107335
index 83c1dca41..54c182141 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107335
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107335
@@ -1,9 +1,5 @@
-'1653',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
 '2144',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
-'2363',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',1600,74800,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,75000,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107336 b/src/main/res-current/raw/current_gtfs_schedule_stop_107336
index 4c6bcc9bf..0d12dfe55 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107336
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107336
@@ -1,7 +1,4 @@
-'1653',700,61800,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61800,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61800,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
 '2142',700,63200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
 '2144',700,61800,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61800,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,63200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
-'2363',700,61800,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107337 b/src/main/res-current/raw/current_gtfs_schedule_stop_107337
index 6ae410417..3365c1299 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107337
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107337
@@ -1,14 +1,8 @@
-'1653',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0,17500,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0
-'1653',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
+'1349',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0,17500,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0
+'1349',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
 '2107',700,72000,4,'',0,19600,4,'',0,20600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
 '2107',701,72000,,'',0,19600,,'',0,20600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
 '2142',700,63300,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,24900,4,'',0
 '2142',701,63300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
 '2144',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
 '2144',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2357',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'2357',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2358',700,63300,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,24900,4,'',0
-'2358',701,63300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'2363',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
-'2363',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107338 b/src/main/res-current/raw/current_gtfs_schedule_stop_107338
index 07835f078..e7c7ea573 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107338
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107338
@@ -1,7 +1,4 @@
-'1653',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62000,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62000,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107339 b/src/main/res-current/raw/current_gtfs_schedule_stop_107339
index 07835f078..e7c7ea573 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107339
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107339
@@ -1,7 +1,4 @@
-'1653',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62000,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62000,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107340 b/src/main/res-current/raw/current_gtfs_schedule_stop_107340
index ad04cbe83..d348a858d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107340
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107340
@@ -1,7 +1,4 @@
-'1653',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62100,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107341 b/src/main/res-current/raw/current_gtfs_schedule_stop_107341
index ad04cbe83..d348a858d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107341
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107341
@@ -1,7 +1,4 @@
-'1653',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62100,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107342 b/src/main/res-current/raw/current_gtfs_schedule_stop_107342
index c475bd919..af04fa213 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107342
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107342
@@ -1,7 +1,4 @@
-'1653',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62100,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107343 b/src/main/res-current/raw/current_gtfs_schedule_stop_107343
index 9d356cd4b..ee9cbb4e5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107343
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107343
@@ -1,7 +1,4 @@
-'1653',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62200,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62200,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107344 b/src/main/res-current/raw/current_gtfs_schedule_stop_107344
index 0e6f4f1d3..d464009dd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107344
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107344
@@ -1,7 +1,4 @@
-'1653',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62200,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63600,0,'Montrose Exch',0,11700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63600,0,'Montrose Exch',0,11700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62200,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107345 b/src/main/res-current/raw/current_gtfs_schedule_stop_107345
index bfc3a4afa..203509b5f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107345
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107345
@@ -1,7 +1,4 @@
-'1653',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62300,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63700,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63700,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62300,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107346 b/src/main/res-current/raw/current_gtfs_schedule_stop_107346
index f1ab34922..1eadce952 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107346
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107346
@@ -1,7 +1,4 @@
-'1653',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62300,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
 '2142',701,63800,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63800,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62300,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107347 b/src/main/res-current/raw/current_gtfs_schedule_stop_107347
index 7e303cf73..1813d5be1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107347
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107347
@@ -1,7 +1,4 @@
-'1653',701,62400,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
+'1349',701,62400,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch',0
 '2107',701,62400,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,12900,,'',0
 '2142',701,63900,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,14400,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
 '2144',701,62400,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2357',701,62400,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
-'2358',701,63900,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,14400,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
-'2363',701,62400,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107348 b/src/main/res-current/raw/current_gtfs_schedule_stop_107348
index 273683ad9..3a53540b6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107348
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107348
@@ -1,9 +1,5 @@
-'1653',701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2142',701,75500,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0
 '2144',701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2357',701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2358',701,75500,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0
-'2363',701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2142',1601,75400,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1601,75600,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107349 b/src/main/res-current/raw/current_gtfs_schedule_stop_107349
index 0be66d4ee..9669080a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107349
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107349
@@ -1,9 +1,5 @@
-'1653',701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',701,75700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
 '2144',701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2357',701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2358',701,75700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'2363',701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',1601,75500,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,75700,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107350 b/src/main/res-current/raw/current_gtfs_schedule_stop_107350
index 929fe3bd4..a8f69eac1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107350
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107350
@@ -1,18 +1,9 @@
-'1653',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',201,51800,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,51400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,8900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,4000,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,102300,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2361',201,102300,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2363',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'1653',701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',701,75800,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
 '2144',701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2357',701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2358',701,75800,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'2363',701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',1601,75600,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,75800,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107351 b/src/main/res-current/raw/current_gtfs_schedule_stop_107351
index af578ce6a..faf558017 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107351
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107351
@@ -1,9 +1,5 @@
-'1653',701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',701,75900,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
 '2144',701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2357',701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2358',701,75900,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'2363',701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
 '2142',1601,75700,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,75900,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107352 b/src/main/res-current/raw/current_gtfs_schedule_stop_107352
index e77005bad..2cd4ea9de 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107352
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107352
@@ -1,9 +1,5 @@
-'1653',701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2142',701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
 '2144',701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2357',701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
-'2358',701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'2363',701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
 '2142',1601,75800,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107353 b/src/main/res-current/raw/current_gtfs_schedule_stop_107353
index 6f427749f..37d06eeea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107353
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107353
@@ -1,9 +1,5 @@
-'1653',701,62700,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62700,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,62900,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
 '2142',701,64200,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,3300,0,'Montrose Exch',0,14600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
 '2144',701,62700,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64200,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,3300,0,'Montrose Exch',0,14600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'2363',701,62900,,'',0,9900,,'',0,9800,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
 '2142',1601,75800,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107354 b/src/main/res-current/raw/current_gtfs_schedule_stop_107354
index d6b11678f..c96db5668 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107354
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107354
@@ -1,9 +1,5 @@
-'1653',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,62900,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
 '2144',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'2363',701,62900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',1601,75800,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107355 b/src/main/res-current/raw/current_gtfs_schedule_stop_107355
index a45086a58..16d7c6e20 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107355
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107355
@@ -1,9 +1,5 @@
-'1653',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,62900,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
 '2144',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'2363',701,62900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',1601,75900,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107356 b/src/main/res-current/raw/current_gtfs_schedule_stop_107356
index 7998e73af..1c1aa318b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107356
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107356
@@ -1,9 +1,5 @@
-'1653',701,62800,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62800,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
 '2142',701,64300,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
 '2144',701,62800,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62800,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64300,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'2363',701,63000,,'',0,9900,,'',0,9800,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
 '2142',1601,75900,,'',0,16000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107357 b/src/main/res-current/raw/current_gtfs_schedule_stop_107357
index d06273607..cf3cf7a91 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107357
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107357
@@ -1,7 +1,4 @@
-'1653',701,62800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,62800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63000,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
 '2144',701,62800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,62800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'2363',701,63000,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107358 b/src/main/res-current/raw/current_gtfs_schedule_stop_107358
index 24f11a89f..820b2140f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107358
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107358
@@ -1,2 +1 @@
 '2142',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107359 b/src/main/res-current/raw/current_gtfs_schedule_stop_107359
index 24f11a89f..820b2140f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107359
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107359
@@ -1,2 +1 @@
 '2142',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107360 b/src/main/res-current/raw/current_gtfs_schedule_stop_107360
index 7c6b55dc7..31a75cfe1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107360
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107360
@@ -1,2 +1 @@
 '2142',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107361 b/src/main/res-current/raw/current_gtfs_schedule_stop_107361
index 7c6b55dc7..31a75cfe1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107361
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107361
@@ -1,2 +1 @@
 '2142',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107363 b/src/main/res-current/raw/current_gtfs_schedule_stop_107363
index ece538147..2c9252ccb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107363
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107363
@@ -1,2 +1 @@
 '2142',1201,71800,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1201,71800,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107364 b/src/main/res-current/raw/current_gtfs_schedule_stop_107364
index 07f7beae7..ea7d2f93b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107364
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107364
@@ -1,2 +1 @@
 '2142',1200,72700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107365 b/src/main/res-current/raw/current_gtfs_schedule_stop_107365
index 82016b8c5..a7adbbe0e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107365
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107365
@@ -1,2 +1 @@
 '2142',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107366 b/src/main/res-current/raw/current_gtfs_schedule_stop_107366
index 1cd62a81a..50ec85dc3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107366
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107366
@@ -1,2 +1 @@
 '2142',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107367 b/src/main/res-current/raw/current_gtfs_schedule_stop_107367
index b56ac4906..cdb571a5a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107367
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107367
@@ -1,2 +1 @@
 '2142',1200,72900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,72900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107368 b/src/main/res-current/raw/current_gtfs_schedule_stop_107368
index bc4d812cb..94361c6a3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107368
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107368
@@ -1,2 +1 @@
 '2142',1200,73000,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73000,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107369 b/src/main/res-current/raw/current_gtfs_schedule_stop_107369
index d92222fc1..97294fab9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107369
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107369
@@ -1,2 +1 @@
 '2142',1200,73100,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73100,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107370 b/src/main/res-current/raw/current_gtfs_schedule_stop_107370
index e73868e7d..7eaad9f03 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107370
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107370
@@ -1,2 +1 @@
 '2142',1200,73200,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73200,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107371 b/src/main/res-current/raw/current_gtfs_schedule_stop_107371
index baf3d0178..2a7746d88 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107371
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107371
@@ -1,2 +1 @@
 '2142',1200,73500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107372 b/src/main/res-current/raw/current_gtfs_schedule_stop_107372
index 45b383339..fb1616db6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107372
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107372
@@ -1,2 +1 @@
 '2142',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107373 b/src/main/res-current/raw/current_gtfs_schedule_stop_107373
index d562d85db..31d4fe804 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107373
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107373
@@ -1,2 +1 @@
 '2142',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'2358',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107374 b/src/main/res-current/raw/current_gtfs_schedule_stop_107374
index 3485e6817..42a756725 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107374
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107374
@@ -1,7 +1,4 @@
 '2107',1501,90400,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62100,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2358',1501,62000,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'2363',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'2142',2600,144800,0,'Montrose Exch Only',0
+'2142',2600,144800,,'',0
 '2142',2601,81100,,'',0
-'2358',2600,81100,,'',0,63700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107375 b/src/main/res-current/raw/current_gtfs_schedule_stop_107375
index 736c3babc..8cd7c348a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107375
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107375
@@ -1,7 +1,4 @@
 '2107',1500,92800,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64400,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
 '2142',2600,143300,0,'Sandy Hl',0
 '2142',2601,75800,0,'Sandy Hl',0
-'2358',2601,75800,0,'Sandy Hl',0,67500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107377 b/src/main/res-current/raw/current_gtfs_schedule_stop_107377
index d1e092430..4917b56ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107377
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107377
@@ -1,4 +1,2 @@
 '2107',1500,92400,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107378 b/src/main/res-current/raw/current_gtfs_schedule_stop_107378
index a5ff15488..c68990ff3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107378
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107378
@@ -1,4 +1,2 @@
 '2107',1501,90900,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107379 b/src/main/res-current/raw/current_gtfs_schedule_stop_107379
index 423ea496d..aee3b5de7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107379
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107379
@@ -1,4 +1,2 @@
 '2107',1501,91000,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107380 b/src/main/res-current/raw/current_gtfs_schedule_stop_107380
index ea9924614..7d293474f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107380
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107380
@@ -1,4 +1,2 @@
 '2107',1501,91200,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107381 b/src/main/res-current/raw/current_gtfs_schedule_stop_107381
index c278bc8a4..403ddbc05 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107381
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107381
@@ -1,4 +1,2 @@
 '2107',1501,91400,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,63000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107382 b/src/main/res-current/raw/current_gtfs_schedule_stop_107382
index 50c0f6e3d..d452fc9fa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107382
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107382
@@ -1,4 +1,2 @@
 '2107',1501,91500,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,63100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,63000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107383 b/src/main/res-current/raw/current_gtfs_schedule_stop_107383
index 6f0ef6080..fe84a9d67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107383
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107383
@@ -1,4 +1,2 @@
 '2107',1501,91600,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,63100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107384 b/src/main/res-current/raw/current_gtfs_schedule_stop_107384
index 790c592a1..fe84a9d67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107384
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107384
@@ -1,4 +1,2 @@
 '2107',1501,91600,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107385 b/src/main/res-current/raw/current_gtfs_schedule_stop_107385
index 77d0a0387..cb20668d4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107385
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107385
@@ -2,7 +2,3 @@
 '2107',1501,91800,4,'',0,20000,4,'',0,40000,4,'',0,20000,4,'',0
 '2142',1500,63400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
 '2142',1501,63400,4,'',0,8300,4,'',0,11900,4,'',0,68400,4,'',0,20300,4,'',0,9000,4,'',0
-'2358',1500,63400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,63400,4,'',0,8300,4,'',0,11900,4,'',0,68400,4,'',0,20300,4,'',0,9000,4,'',0
-'2363',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'2363',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107386 b/src/main/res-current/raw/current_gtfs_schedule_stop_107386
index 597bacf41..5b2cb96df 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107386
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107386
@@ -1,4 +1,2 @@
 '2107',1500,91900,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,63500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,63500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107387 b/src/main/res-current/raw/current_gtfs_schedule_stop_107387
index 1b37596a4..18f1c3767 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107387
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107387
@@ -1,4 +1,2 @@
 '2107',1500,92100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107388 b/src/main/res-current/raw/current_gtfs_schedule_stop_107388
index 1b37596a4..18f1c3767 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107388
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107388
@@ -1,4 +1,2 @@
 '2107',1500,92100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107389 b/src/main/res-current/raw/current_gtfs_schedule_stop_107389
index 2f07a41f7..0da02b5aa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107389
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107389
@@ -1,4 +1,2 @@
 '2107',1500,92300,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,63900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,63900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107390 b/src/main/res-current/raw/current_gtfs_schedule_stop_107390
index 5cf2d939e..ba843e2f8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107390
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107390
@@ -1,6 +1,3 @@
 '2107',1500,92500,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'2142',2600,145800,0,'Montrose Exch Only',0
-'2358',2600,145800,0,'Montrose Exch Only',0
+'2142',2600,145800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107391 b/src/main/res-current/raw/current_gtfs_schedule_stop_107391
index 9a7c68cdd..8badba6f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107391
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107391
@@ -1,7 +1,4 @@
 '2107',1500,92900,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,64500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,64500,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
 '2142',2600,143400,0,'Sandy Hl',0
 '2142',2601,75900,0,'Sandy Hl',0
-'2358',2601,75900,0,'Sandy Hl',0,67500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107392 b/src/main/res-current/raw/current_gtfs_schedule_stop_107392
index 98b253e64..fbe06bd16 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107392
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107392
@@ -1,7 +1,4 @@
-'1653',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63500,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0
 '2144',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0
-'2363',701,63500,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107393 b/src/main/res-current/raw/current_gtfs_schedule_stop_107393
index ff6e7c3cc..b1ae26fca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107393
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107393
@@ -1,7 +1,4 @@
-'1653',701,63100,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,63100,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63300,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
 '2144',701,63100,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63100,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'2363',701,63300,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107394 b/src/main/res-current/raw/current_gtfs_schedule_stop_107394
index 265453c4e..28eb8938f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107394
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107394
@@ -1,2 +1 @@
 '2142',1600,74100,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74200,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107395 b/src/main/res-current/raw/current_gtfs_schedule_stop_107395
index b527c8e5b..4ff0e316a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107395
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107395
@@ -1,2 +1 @@
 '2142',1600,74300,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74400,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107396 b/src/main/res-current/raw/current_gtfs_schedule_stop_107396
index b527c8e5b..4ff0e316a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107396
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107396
@@ -1,2 +1 @@
 '2142',1600,74300,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74400,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107397 b/src/main/res-current/raw/current_gtfs_schedule_stop_107397
index 64eccfe65..10fbbc3ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107397
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107397
@@ -1,2 +1 @@
 '2142',1600,74400,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74500,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107398 b/src/main/res-current/raw/current_gtfs_schedule_stop_107398
index 64eccfe65..10fbbc3ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107398
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107398
@@ -1,2 +1 @@
 '2142',1600,74400,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74500,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107399 b/src/main/res-current/raw/current_gtfs_schedule_stop_107399
index 037237b89..a1dd426e9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107399
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107399
@@ -1,2 +1 @@
 '2142',1600,74500,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,74600,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107400 b/src/main/res-current/raw/current_gtfs_schedule_stop_107400
index ffa877022..07a70f021 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107400
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107400
@@ -1,4 +1,2 @@
 '2142',1600,74900,4,'',0,16000,4,'',0,64500,4,'',0,8500,4,'',0
 '2142',1601,74900,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1600,75100,4,'',0,15900,4,'',0,64400,4,'',0,8500,4,'',0
-'2358',1601,75100,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107401 b/src/main/res-current/raw/current_gtfs_schedule_stop_107401
index 99da8b48f..a46776394 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107401
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107401
@@ -1,2 +1 @@
 '2142',1601,75000,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1601,75200,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107402 b/src/main/res-current/raw/current_gtfs_schedule_stop_107402
index 99da8b48f..a46776394 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107402
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107402
@@ -1,2 +1 @@
 '2142',1601,75000,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1601,75200,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107403 b/src/main/res-current/raw/current_gtfs_schedule_stop_107403
index c9dbffb8a..bde15c50b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107403
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107403
@@ -1,2 +1 @@
 '2142',1601,75100,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1601,75300,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107404 b/src/main/res-current/raw/current_gtfs_schedule_stop_107404
index 555b11aca..cc6506144 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107404
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107404
@@ -1,2 +1 @@
 '2142',1601,75200,,'',0,16000,,'',0,64500,,'',0,8500,,'',0
-'2358',1601,75400,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107405 b/src/main/res-current/raw/current_gtfs_schedule_stop_107405
index c92c7181c..217223140 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107405
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107405
@@ -1,2 +1 @@
 '2142',1601,80100,,'',0,12000,,'',0,68500,,'',0,4500,,'',0
-'2358',1601,80300,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107406 b/src/main/res-current/raw/current_gtfs_schedule_stop_107406
index 1f365086b..aaac32c3d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107406
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107406
@@ -1,2 +1 @@
 '2142',1601,80100,,'',0,12000,,'',0,68600,,'',0,4500,,'',0
-'2358',1601,80300,,'',0,11900,,'',0,68500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107407 b/src/main/res-current/raw/current_gtfs_schedule_stop_107407
index 4e2f900ee..615b981a4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107407
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107407
@@ -1,2 +1 @@
 '2142',1601,80300,,'',0,12000,,'',0,68500,,'',0,4600,,'',0
-'2358',1601,80500,,'',0,11900,,'',0,68400,,'',0,4600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107408 b/src/main/res-current/raw/current_gtfs_schedule_stop_107408
index 317f3e351..e2f45519d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107408
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107408
@@ -1,13 +1,6 @@
 '2142',1701,63100,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3600,,'',0,8300,,'',0,7900,,'',0,3500,,'',0
-'2358',1701,63100,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90600,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90600,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81300,,'',0,12700,,'',0,16600,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60200,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11400,,'',0,12600,,'',0,7300,,'',0,8900,,'',0,4300,,'',0,10500,,'',0,15900,,'',0,11300,,'',0
 '2144',2101,90600,,'',0,13000,,'',0,16500,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,17400,,'',0
-'2358',2101,60500,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15300,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
-'2360',2101,72400,,'',0
-'2361',2101,72400,,'',0
-'2363',2101,74200,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
 '2142',2401,80000,0,'Ctr Loop',0
-'2358',2401,80000,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107409 b/src/main/res-current/raw/current_gtfs_schedule_stop_107409
index cf333f4e6..05b78ee83 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107409
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107409
@@ -1,11 +1,5 @@
 '2142',1701,63400,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63400,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,90900,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,90900,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81600,,'',0,12700,,'',0,16700,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60500,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,10400,,'',0,15900,,'',0,11200,,'',0
 '2144',2101,90900,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,60800,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72700,,'',0
-'2361',2101,72700,,'',0
-'2363',2101,74500,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107410 b/src/main/res-current/raw/current_gtfs_schedule_stop_107410
index c86565376..b3e4f599e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107410
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107410
@@ -1,11 +1,5 @@
 '2142',1701,63500,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63500,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'1653',2101,91000,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91000,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81700,,'',0,12700,,'',0,16700,,'',0,13100,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13600,,'',0
 '2142',2101,60600,,'',0,3800,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,10400,,'',0,15900,,'',0,11200,,'',0
 '2144',2101,91000,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17100,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,60900,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72800,,'',0
-'2361',2101,72800,,'',0
-'2363',2101,74600,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107411 b/src/main/res-current/raw/current_gtfs_schedule_stop_107411
index 52e2f4b12..c3ea2db6b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107411
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107411
@@ -1,2 +1 @@
 '2142',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107412 b/src/main/res-current/raw/current_gtfs_schedule_stop_107412
index 2ee77f884..c35c45a6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107412
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107412
@@ -1,2 +1 @@
 '2142',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107413 b/src/main/res-current/raw/current_gtfs_schedule_stop_107413
index 62d525601..b5a48c4d8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107413
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107413
@@ -1,2 +1 @@
 '2142',1700,64300,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64300,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107414 b/src/main/res-current/raw/current_gtfs_schedule_stop_107414
index 56d57f803..cf1f3cc28 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107414
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107414
@@ -1,11 +1,5 @@
 '2142',1700,64400,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64400,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
-'1653',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91100,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65200,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13200,,'',0,7700,,'',0,9600,,'',0,3300,,'',0,9800,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64900,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3300,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81700,,'',0
-'2361',2100,81700,,'',0
-'2363',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107415 b/src/main/res-current/raw/current_gtfs_schedule_stop_107415
index 6ea9f07e3..2aa5f9106 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107415
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107415
@@ -1,11 +1,5 @@
 '2142',1700,64500,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64500,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
-'1653',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91200,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65300,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13200,,'',0,7700,,'',0,9600,,'',0,3300,,'',0,9800,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65000,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3300,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81800,,'',0
-'2361',2100,81800,,'',0
-'2363',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107416 b/src/main/res-current/raw/current_gtfs_schedule_stop_107416
index 52e2f4b12..c3ea2db6b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107416
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107416
@@ -1,2 +1 @@
 '2142',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
-'2358',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107417 b/src/main/res-current/raw/current_gtfs_schedule_stop_107417
index f3e1df198..62dce1539 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107417
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107417
@@ -1,4 +1,2 @@
 '2142',1700,63700,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3500,,'',0
 '2142',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76400,4,'',0,3700,4,'',0,8300,4,'',0,7800,4,'',0,3500,4,'',0
-'2358',1700,63700,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
-'2358',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76400,4,'',0,3700,4,'',0,8300,4,'',0,7800,4,'',0,3600,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107418 b/src/main/res-current/raw/current_gtfs_schedule_stop_107418
index 181e2e9b1..792352680 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107418
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107418
@@ -1,2 +1 @@
 '2142',1700,63800,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,63800,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107419 b/src/main/res-current/raw/current_gtfs_schedule_stop_107419
index 83614f3f9..1f8e1dbb4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107419
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107419
@@ -1,2 +1 @@
 '2142',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107420 b/src/main/res-current/raw/current_gtfs_schedule_stop_107420
index 83614f3f9..1f8e1dbb4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107420
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107420
@@ -1,2 +1 @@
 '2142',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107421 b/src/main/res-current/raw/current_gtfs_schedule_stop_107421
index 1cc277809..27dd0bf33 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107421
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107421
@@ -1,2 +1 @@
 '2142',1700,64000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,64000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107422 b/src/main/res-current/raw/current_gtfs_schedule_stop_107422
index 272c3b4e2..ab5ad6e04 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107422
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107422
@@ -1,2 +1 @@
 '2142',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107423 b/src/main/res-current/raw/current_gtfs_schedule_stop_107423
index 272c3b4e2..ab5ad6e04 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107423
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107423
@@ -1,2 +1 @@
 '2142',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3500,,'',0
-'2358',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107424 b/src/main/res-current/raw/current_gtfs_schedule_stop_107424
index 2ee77f884..c35c45a6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107424
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107424
@@ -1,2 +1 @@
 '2142',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107425 b/src/main/res-current/raw/current_gtfs_schedule_stop_107425
index 109bef250..140e85550 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107425
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107425
@@ -1,11 +1,5 @@
 '2142',1700,64600,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64600,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
-'1653',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91300,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65400,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13200,,'',0,7700,,'',0,9600,,'',0,3300,,'',0,9800,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65100,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9600,,'',0,11600,,'',0,14900,,'',0
-'2360',2100,81900,,'',0
-'2361',2100,81900,,'',0
-'2363',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107426 b/src/main/res-current/raw/current_gtfs_schedule_stop_107426
index 346d553ce..3a80dc359 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107426
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107426
@@ -1,11 +1,5 @@
 '2142',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7500,,'',0
-'2358',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
-'1653',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91400,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65500,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13200,,'',0,7700,,'',0,9600,,'',0,3300,,'',0,9800,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,65200,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13500,,'',0,7700,,'',0,9400,,'',0,3400,,'',0,9600,,'',0,15600,,'',0,10900,,'',0
-'2360',2100,82000,,'',0
-'2361',2100,82000,,'',0
-'2363',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107427 b/src/main/res-current/raw/current_gtfs_schedule_stop_107427
index ac7a50707..1472cc666 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107427
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107427
@@ -1,9 +1,4 @@
-'1653',2101,91000,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91000,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81700,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,60600,,'',0,3900,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,10400,,'',0,15800,,'',0,11200,,'',0
 '2144',2101,91000,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61000,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,72900,,'',0
-'2361',2101,72900,,'',0
-'2363',2101,74600,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107428 b/src/main/res-current/raw/current_gtfs_schedule_stop_107428
index 6d57557c8..0290a1aa2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107428
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107428
@@ -1,7 +1,4 @@
-'1653',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81800,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,60800,,'',0,3900,,'',0,18900,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,14400,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61200,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,14100,,'',0,11900,,'',0,11100,,'',0
-'2363',2101,74700,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107429 b/src/main/res-current/raw/current_gtfs_schedule_stop_107429
index 91c00a02f..69c0f216a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107429
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107429
@@ -1,9 +1,4 @@
-'1653',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82000,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,61000,,'',0,3900,,'',0,9100,,'',0,9800,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,14400,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
-'2360',2101,74100,,'',0
-'2361',2101,74100,,'',0
-'2363',2101,74900,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107430 b/src/main/res-current/raw/current_gtfs_schedule_stop_107430
index 91c00a02f..69c0f216a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107430
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107430
@@ -1,9 +1,4 @@
-'1653',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82000,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,61000,,'',0,3900,,'',0,9100,,'',0,9800,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,14400,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
-'2360',2101,74100,,'',0
-'2361',2101,74100,,'',0
-'2363',2101,74900,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107431 b/src/main/res-current/raw/current_gtfs_schedule_stop_107431
index b22bf88c8..e6e1c1800 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107431
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107431
@@ -1,9 +1,4 @@
-'1653',2101,91400,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91400,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82100,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,61100,,'',0,3900,,'',0,9100,,'',0,9800,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,14400,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91400,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61500,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
-'2360',2101,74200,,'',0
-'2361',2101,74200,,'',0
-'2363',2101,75000,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107432 b/src/main/res-current/raw/current_gtfs_schedule_stop_107432
index ff0d0da96..28e70d80b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107432
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107432
@@ -1,9 +1,4 @@
-'1653',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82200,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,61200,,'',0,3900,,'',0,9100,,'',0,9800,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,8300,,'',0,10400,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61600,,'',0,3600,,'',0,18800,,'',0,11900,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
-'2360',2101,74300,,'',0
-'2361',2101,74300,,'',0
-'2363',2101,75100,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107433 b/src/main/res-current/raw/current_gtfs_schedule_stop_107433
index 5741aa29f..eaa9fd4b8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107433
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107433
@@ -1,9 +1,4 @@
-'1653',2101,91700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82400,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13400,,'',0
 '2142',2101,61400,,'',0,3900,,'',0,9100,,'',0,9800,,'',0,10800,,'',0,16500,,'',0,11500,,'',0,12700,,'',0,7300,,'',0,9000,,'',0,8300,,'',0,10300,,'',0,11800,,'',0,11200,,'',0
 '2144',2101,91700,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61800,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11500,,'',0,17100,,'',0,3100,,'',0,8900,,'',0,8500,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'2360',2101,74500,,'',0
-'2361',2101,74500,,'',0
-'2363',2101,75300,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107434 b/src/main/res-current/raw/current_gtfs_schedule_stop_107434
index 963f3fb6e..acb6a1d00 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107434
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107434
@@ -1,9 +1,4 @@
-'1653',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82600,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13400,,'',0
 '2142',2101,61600,,'',0,4000,,'',0,9100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,12600,,'',0,7400,,'',0,9100,,'',0,8100,,'',0,10400,,'',0,11800,,'',0,11100,,'',0
 '2144',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0
-'2357',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
-'2358',2101,62000,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17000,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10100,,'',0,11800,,'',0,11100,,'',0
-'2360',2101,74700,,'',0
-'2361',2101,74700,,'',0
-'2363',2101,75500,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107435 b/src/main/res-current/raw/current_gtfs_schedule_stop_107435
index db221fb22..cb9f0386e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107435
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107435
@@ -1,9 +1,4 @@
-'1653',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82700,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13300,,'',0
 '2142',2101,61700,,'',0,4000,,'',0,9100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,16700,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10300,,'',0,11800,,'',0,11100,,'',0
 '2144',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0
-'2357',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
-'2358',2101,62100,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
-'2360',2101,74800,,'',0
-'2361',2101,74800,,'',0
-'2363',2101,75600,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107436 b/src/main/res-current/raw/current_gtfs_schedule_stop_107436
index f65e3ed25..a185a433f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107436
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107436
@@ -1,9 +1,4 @@
-'1653',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82800,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13300,,'',0
 '2142',2101,61800,,'',0,4000,,'',0,9100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,16700,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10300,,'',0,11800,,'',0,11100,,'',0
 '2144',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0
-'2357',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
-'2358',2101,62200,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
-'2360',2101,74900,,'',0
-'2361',2101,74900,,'',0
-'2363',2101,75700,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107437 b/src/main/res-current/raw/current_gtfs_schedule_stop_107437
index 58ded2a50..3d5192cbe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107437
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107437
@@ -1,9 +1,4 @@
-'1653',2101,92200,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,92200,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,82900,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13300,,'',0
 '2142',2101,61900,,'',0,4000,,'',0,9100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,16700,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10300,,'',0,11800,,'',0,11100,,'',0
 '2144',2101,92200,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0
-'2357',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
-'2358',2101,62300,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
-'2360',2101,75000,,'',0
-'2361',2101,75000,,'',0
-'2363',2101,75800,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107438 b/src/main/res-current/raw/current_gtfs_schedule_stop_107438
index 31c7f0782..4fd19b852 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107438
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107438
@@ -1,9 +1,4 @@
-'1653',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12600,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12600,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,85900,,'',0,15100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,64000,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12600,,'',0,17000,,'',0
-'2357',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,63700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80500,,'',0
-'2361',2100,80500,,'',0
-'2363',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107440 b/src/main/res-current/raw/current_gtfs_schedule_stop_107440
index 21e467b42..563a33465 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107440
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107440
@@ -1,9 +1,4 @@
-'1653',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90000,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,64100,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0
-'2357',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,63800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80600,,'',0
-'2361',2100,80600,,'',0
-'2363',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107441 b/src/main/res-current/raw/current_gtfs_schedule_stop_107441
index 5985e9d73..563a33465 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107441
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107441
@@ -1,9 +1,4 @@
-'1653',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90000,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,64100,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0
-'2357',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,63800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80600,,'',0
-'2361',2100,80600,,'',0
-'2363',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107442 b/src/main/res-current/raw/current_gtfs_schedule_stop_107442
index c481d1a85..4504dc87c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107442
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107442
@@ -1,9 +1,4 @@
-'1653',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90100,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,64200,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0
-'2357',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,63900,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80700,,'',0
-'2361',2100,80700,,'',0
-'2363',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107443 b/src/main/res-current/raw/current_gtfs_schedule_stop_107443
index 9ad29db27..e1a80133c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107443
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107443
@@ -1,9 +1,4 @@
-'1653',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90200,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,64300,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0
-'2357',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,64000,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80800,,'',0
-'2361',2100,80800,,'',0
-'2363',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107444 b/src/main/res-current/raw/current_gtfs_schedule_stop_107444
index db0b3d954..c09bd21a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107444
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107444
@@ -1,9 +1,4 @@
-'1653',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90300,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,16900,,'',0,12900,,'',0,17000,,'',0
 '2142',2100,64400,,'',0,7300,,'',0,9200,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,11000,,'',0
 '2144',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64100,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80900,,'',0
-'2361',2100,80900,,'',0
-'2363',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9800,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107445 b/src/main/res-current/raw/current_gtfs_schedule_stop_107445
index 9f20f2f01..0e5b7467b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107445
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107445
@@ -1,9 +1,4 @@
-'1653',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90500,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,17000,,'',0,13000,,'',0
 '2142',2100,64600,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13100,,'',0,7100,,'',0,5600,,'',0,7900,,'',0,9800,,'',0,11500,,'',0,15000,,'',0
 '2144',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13000,,'',0
-'2357',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
-'2358',2100,64300,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17300,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81100,,'',0
-'2361',2100,81100,,'',0
-'2363',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9900,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107446 b/src/main/res-current/raw/current_gtfs_schedule_stop_107446
index 1eb034a11..24cb08059 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107446
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107446
@@ -1,9 +1,4 @@
-'1653',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90700,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,64800,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13100,,'',0,7100,,'',0,9600,,'',0,3900,,'',0,9800,,'',0,11500,,'',0,15000,,'',0
 '2144',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64500,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81300,,'',0
-'2361',2100,81300,,'',0
-'2363',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107447 b/src/main/res-current/raw/current_gtfs_schedule_stop_107447
index c0ef8edd2..998763dea 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107447
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107447
@@ -1,9 +1,4 @@
-'1653',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90800,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,64900,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13100,,'',0,7100,,'',0,9600,,'',0,3900,,'',0,9800,,'',0,11500,,'',0,15000,,'',0
 '2144',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64600,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81400,,'',0
-'2361',2100,81400,,'',0
-'2363',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107448 b/src/main/res-current/raw/current_gtfs_schedule_stop_107448
index db04699e7..ca588fe2f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107448
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107448
@@ -1,9 +1,4 @@
-'1653',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90900,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65000,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13100,,'',0,7100,,'',0,9600,,'',0,3900,,'',0,9800,,'',0,11500,,'',0,15000,,'',0
 '2144',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81500,,'',0
-'2361',2100,81500,,'',0
-'2363',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107449 b/src/main/res-current/raw/current_gtfs_schedule_stop_107449
index db04699e7..ca588fe2f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107449
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107449
@@ -1,9 +1,4 @@
-'1653',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,90900,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65000,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13100,,'',0,7100,,'',0,9600,,'',0,3900,,'',0,9800,,'',0,11500,,'',0,15000,,'',0
 '2144',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81500,,'',0
-'2361',2100,81500,,'',0
-'2363',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107450 b/src/main/res-current/raw/current_gtfs_schedule_stop_107450
index a3f417c56..be6c172a5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107450
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107450
@@ -1,9 +1,4 @@
-'1653',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,91000,,'',0,11100,,'',0,12800,,'',0,18500,,'',0,17200,,'',0,12900,,'',0,16900,,'',0,13000,,'',0
 '2142',2100,65100,,'',0,7300,,'',0,9300,,'',0,9700,,'',0,11800,,'',0,11500,,'',0,15800,,'',0,13200,,'',0,20600,,'',0,9800,,'',0,11400,,'',0,15000,,'',0
 '2144',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16500,,'',0,13000,,'',0
-'2357',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
-'2358',2100,64800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,20500,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
-'2360',2100,81600,,'',0
-'2361',2100,81600,,'',0
-'2363',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107451 b/src/main/res-current/raw/current_gtfs_schedule_stop_107451
index 8e5524418..bfa4deee3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107451
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107451
@@ -1,5 +1,2 @@
 '2142',2100,150800,,'',0,9600,,'',0
 '2142',2101,73200,,'',0
-'2358',2100,151000,,'',0,9400,,'',0
-'2360',2101,73300,,'',0
-'2361',2101,73300,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107452 b/src/main/res-current/raw/current_gtfs_schedule_stop_107452
index 89fdfc887..655fe84c5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107452
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107452
@@ -1,5 +1,2 @@
 '2142',2100,151000,,'',0,9600,,'',0
 '2142',2101,73400,,'',0
-'2358',2100,151200,,'',0,9400,,'',0
-'2360',2101,73500,,'',0
-'2361',2101,73500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107453 b/src/main/res-current/raw/current_gtfs_schedule_stop_107453
index aaa316f4e..900d292f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107453
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107453
@@ -1,5 +1,2 @@
 '2142',2100,151000,,'',0,9600,,'',0
 '2142',2101,73500,,'',0
-'2358',2100,151200,,'',0,9400,,'',0
-'2360',2101,73600,,'',0
-'2361',2101,73600,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107454 b/src/main/res-current/raw/current_gtfs_schedule_stop_107454
index 33b7134f2..2a760c4c0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107454
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107454
@@ -1,5 +1,2 @@
 '2142',2100,151200,,'',0,9600,,'',0
 '2142',2101,73700,,'',0
-'2358',2100,151400,,'',0,9400,,'',0
-'2360',2101,73800,,'',0
-'2361',2101,73800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107455 b/src/main/res-current/raw/current_gtfs_schedule_stop_107455
index b0488ef93..e43838188 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107455
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107455
@@ -1,2 +1 @@
 '2142',2100,151400,,'',0,9600,,'',0
-'2358',2100,151600,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107456 b/src/main/res-current/raw/current_gtfs_schedule_stop_107456
index b0488ef93..e43838188 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107456
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107456
@@ -1,2 +1 @@
 '2142',2100,151400,,'',0,9600,,'',0
-'2358',2100,151600,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107457 b/src/main/res-current/raw/current_gtfs_schedule_stop_107457
index c45618fc4..94f1d13ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107457
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107457
@@ -1,3 +1 @@
 '2142',2101,73000,,'',0
-'2360',2101,73100,,'',0
-'2361',2101,73100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107458 b/src/main/res-current/raw/current_gtfs_schedule_stop_107458
index 1cc5bc228..374e512b5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107458
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107458
@@ -1,3 +1 @@
 '2142',2101,73100,,'',0
-'2360',2101,73200,,'',0
-'2361',2101,73200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107481 b/src/main/res-current/raw/current_gtfs_schedule_stop_107481
index 9005b2a3e..b07fbb8ae 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107481
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107481
@@ -1,10 +1,6 @@
-'1653',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2142',2600,144200,0,'Montrose Exch Only',0
+'2142',2600,144200,,'',0
 '2142',2601,80600,,'',0
-'2358',2600,80600,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107483 b/src/main/res-current/raw/current_gtfs_schedule_stop_107483
index 833744678..01c197b0b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107483
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107483
@@ -1,7 +1,4 @@
-'1653',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107485 b/src/main/res-current/raw/current_gtfs_schedule_stop_107485
index 688b175a1..bf6a1abbe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107485
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107485
@@ -1,7 +1,4 @@
-'1653',3100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85100,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60400,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,5800,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,60400,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85100,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107486 b/src/main/res-current/raw/current_gtfs_schedule_stop_107486
index d91408c08..9c6ba14d0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107486
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107486
@@ -1,7 +1,4 @@
-'1653',3100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85200,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,60500,,'',0,3100,,'',0,1300,,'',0,5700,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1600,,'',0,1400,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3300,,'',0,5900,,'',0,1800,,'',0,1100,,'',0,1000,,'',0,5800,,'',0,1400,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1300,,'',0,1600,,'',0,2000,,'',0,8000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,60500,,'',0,3100,,'',0,1300,,'',0,5700,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1600,,'',0,1400,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,900,,'',0,5500,,'',0,1400,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1300,,'',0,1600,,'',0,2000,,'',0,8000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85200,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107487 b/src/main/res-current/raw/current_gtfs_schedule_stop_107487
index 374090fc9..88d33d934 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107487
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107487
@@ -1,7 +1,4 @@
-'1653',3101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,70600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
 '2144',3101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,70600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'2363',3101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107488 b/src/main/res-current/raw/current_gtfs_schedule_stop_107488
index ff60ee549..e8c02516f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107488
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107488
@@ -1,7 +1,4 @@
-'1653',3101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,70700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
 '2144',3101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,70700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'2363',3101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107489 b/src/main/res-current/raw/current_gtfs_schedule_stop_107489
index ec82fced1..5ca28e715 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107489
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107489
@@ -1,7 +1,4 @@
-'1653',3101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,70700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,4500,,'',0,16300,,'',0
 '2144',3101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3101,70700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,4500,,'',0,16300,,'',0
-'2363',3101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107490 b/src/main/res-current/raw/current_gtfs_schedule_stop_107490
index 46afdb157..246ae72b1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107490
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107490
@@ -1,7 +1,4 @@
-'1653',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,65500,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,65500,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107491 b/src/main/res-current/raw/current_gtfs_schedule_stop_107491
index 2fd2834e4..2538b17d7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107491
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107491
@@ -1,7 +1,4 @@
-'1653',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,65500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,65500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107492 b/src/main/res-current/raw/current_gtfs_schedule_stop_107492
index 6412c1527..eff9f041a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107492
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107492
@@ -1,7 +1,4 @@
-'1653',3100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,65600,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
 '2144',3100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,65600,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'2363',3100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107493 b/src/main/res-current/raw/current_gtfs_schedule_stop_107493
index 7c40c9513..7ccf42401 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107493
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107493
@@ -1,7 +1,4 @@
-'1653',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
+'1349',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
 '2107',701,72600,,'',0,19600,,'',0,20600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2142',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
 '2144',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2357',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2358',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'2363',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107494 b/src/main/res-current/raw/current_gtfs_schedule_stop_107494
index 7c40c9513..7ccf42401 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107494
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107494
@@ -1,7 +1,4 @@
-'1653',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
+'1349',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
 '2107',701,72600,,'',0,19600,,'',0,20600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2142',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
 '2144',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2357',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2358',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'2363',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107495 b/src/main/res-current/raw/current_gtfs_schedule_stop_107495
index ae4212cfe..89a7547f6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107495
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107495
@@ -1,7 +1,4 @@
-'1653',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
+'1349',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
 '2107',701,72700,,'',0,19600,,'',0,20600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
 '2142',701,64100,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
 '2144',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2357',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2358',701,64100,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
-'2363',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107496 b/src/main/res-current/raw/current_gtfs_schedule_stop_107496
index 871da6aa5..368cf0ced 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107496
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107496
@@ -1,7 +1,4 @@
-'1653',701,62600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
+'1349',701,62600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20000,0,'Montrose Exch',0
 '2107',701,72700,,'',0,19700,,'',0,20600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64100,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
 '2144',701,62600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2357',701,62600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'2358',701,64100,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
-'2363',701,72700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107498 b/src/main/res-current/raw/current_gtfs_schedule_stop_107498
index 0b828be30..53bb225be 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107498
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107498
@@ -1,9 +1,4 @@
-'1653',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,81800,,'',0,12700,,'',0,16700,,'',0,13200,,'',0,16900,,'',0,12800,,'',0,17100,,'',0,13500,,'',0
 '2142',2101,60700,,'',0,3900,,'',0,8300,,'',0,10600,,'',0,10900,,'',0,16400,,'',0,11500,,'',0,12600,,'',0,7300,,'',0,9000,,'',0,4300,,'',0,10400,,'',0,15800,,'',0,11200,,'',0
 '2144',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17100,,'',0
-'2357',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
-'2358',2101,61100,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'2360',2101,73000,,'',0
-'2361',2101,73000,,'',0
-'2363',2101,74700,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107499 b/src/main/res-current/raw/current_gtfs_schedule_stop_107499
index bd5b5af57..aa0d860d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107499
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107499
@@ -1,46 +1,25 @@
-'1653',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
 '2142',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2357',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'2358',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
-'1653',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,17500,4,'',0
+'1349',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,17500,4,'',0
 '2107',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
 '2144',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
-'2357',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
-'2363',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
-'1653',500,64900,4,'',0,10700,4,'',0,10100,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9300,4,'',0,5000,4,'',0,9700,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',500,64900,4,'',0,10700,4,'',0,10100,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9300,4,'',0,5000,4,'',0,9700,4,'',0,10000,4,'',0,10500,4,'',0,9500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',500,71000,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3400,4,'',0,7200,4,'',0,7500,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,2800,4,'',0,6900,4,'',0,5600,4,'',0
 '2142',500,62300,4,'',0,9200,4,'',0,3500,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7600,4,'',0,3000,4,'',0,7000,4,'',0,3600,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,7400,4,'',0,3700,4,'',0,7400,4,'',0,3300,4,'',0,7000,4,'',0,3300,4,'',0,7300,4,'',0,3300,4,'',0,7000,4,'',0,8400,4,'',0,4500,4,'',0,9800,4,'',0
 '2144',500,64900,4,'',0,10700,4,'',0,10100,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,9000,4,'',0,9000,4,'',0,9300,4,'',0,5000,4,'',0,9700,4,'',0,10000,4,'',0
-'2357',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
-'2358',500,62100,4,'',0,9300,4,'',0,3500,4,'',0,7200,4,'',0,3100,4,'',0,6900,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7700,4,'',0,3600,4,'',0,7600,4,'',0,7500,4,'',0,3800,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,2900,4,'',0,7300,4,'',0,7400,4,'',0,2700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
-'2363',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
-'1653',701,64000,4,'',0,10300,4,'',0,9900,4,'',0,9800,4,'',0,9400,4,'',0,10300,4,'',0,9700,4,'',0,10300,4,'',0,9700,4,'',0,10200,4,'',0,9800,4,'',0,10100,4,'',0,9700,4,'',0,12500,4,'',0,7700,4,'',0,9800,4,'',0,10200,4,'',0,9800,4,'',0,10200,4,'',0,9800,4,'',0,10200,4,'',0
+'1349',701,64000,4,'',0,10300,4,'',0,9900,4,'',0,9800,4,'',0,9400,4,'',0,10300,4,'',0,9700,4,'',0,10300,4,'',0,9700,4,'',0,10200,4,'',0,9800,4,'',0,10100,4,'',0,9700,4,'',0,12500,4,'',0,7700,4,'',0,9800,4,'',0,10200,4,'',0,9800,4,'',0,10200,4,'',0,9800,4,'',0,10200,4,'',0
 '2107',701,64200,4,'',0,9900,4,'',0,9900,4,'',0,9800,4,'',0,10400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,14800,4,'',0,10200,4,'',0,10600,4,'',0,10200,4,'',0,10200,4,'',0,10300,4,'',0,10000,4,'',0,12800,4,'',0
 '2144',701,64000,4,'',0,10300,4,'',0,9900,4,'',0,9800,4,'',0,9400,4,'',0,10300,4,'',0,9700,4,'',0,10300,4,'',0,9700,4,'',0,10200,4,'',0,9800,4,'',0,10100,4,'',0,9700,4,'',0,12500,4,'',0
-'2357',701,64000,4,'',0,10300,4,'',0,9900,4,'',0,9800,4,'',0,9400,4,'',0,10300,4,'',0,9700,4,'',0,10300,4,'',0,9700,4,'',0,10200,4,'',0,9800,4,'',0,10100,4,'',0,9700,4,'',0,12500,4,'',0
-'2363',701,64200,4,'',0,9900,4,'',0,9900,4,'',0,8800,4,'',0,11400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,14800,4,'',0,10200,4,'',0,10600,4,'',0,10200,4,'',0,10200,4,'',0,10300,4,'',0,10000,4,'',0,12800,4,'',0
-'1653',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0
+'1349',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0
 '2107',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10200,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
 '2144',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
-'2357',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
-'2363',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
 '2142',1200,74000,4,'',0,7500,4,'',0,4000,4,'',0,7800,4,'',0,7800,4,'',0,3300,4,'',0,15800,4,'',0,11600,4,'',0,11900,4,'',0,1800,4,'',0,8600,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,3100,4,'',0
-'2358',1200,74000,4,'',0,7500,4,'',0,4000,4,'',0,7800,4,'',0,7800,4,'',0,3300,4,'',0,15800,4,'',0,11600,4,'',0,11900,4,'',0,1800,4,'',0,8600,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,3100,4,'',0
-'1653',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,16500,,'',0
+'1349',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,16500,,'',0
 '2107',2101,80700,,'',0,12700,,'',0,16600,,'',0,13000,,'',0,12900,,'',0,16800,,'',0,13200,,'',0,17600,,'',0
 '2142',2101,55700,,'',0,7800,,'',0,8200,,'',0,10600,,'',0,10900,,'',0,12400,,'',0,15400,,'',0,12500,,'',0,7300,,'',0,4900,,'',0,8300,,'',0,10500,,'',0,16000,,'',0,11300,,'',0
 '2144',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13100,,'',0,16800,,'',0,13100,,'',0
-'2357',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
-'2358',2101,60000,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,4800,,'',0,8500,,'',0,10300,,'',0,15900,,'',0,11300,,'',0
-'2360',2101,71800,,'',0
-'2361',2101,71800,,'',0
-'2363',2101,73600,,'',0,20000,,'',0,11600,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
 '2142',2400,145900,4,'',0
 '2142',2401,81200,4,'',0
-'2358',2400,145900,4,'',0
-'2358',2401,81200,4,'',0
 '2142',2601,82800,4,'',0
-'2358',2600,82800,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107500 b/src/main/res-current/raw/current_gtfs_schedule_stop_107500
index cd9273929..3e742016f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107500
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107500
@@ -1,29 +1,14 @@
-'1653',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,53200,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,1900,,'',0,1200,4,'',0,4800,,'',0,2200,,'',0,1700,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2357',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'2358',201,52900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,800,4,'',0,5200,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2360',201,104000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,104000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'1653',301,62700,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,62700,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9600,,'',0
 '2142',301,55900,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9900,,'',0
 '2144',301,62700,,'',0,10700,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,5000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,55900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'2363',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'1653',601,60000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,60000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',601,55500,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8500,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
 '2144',601,60000,,'',0,13000,,'',0,10000,,'',0,10500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2357',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
-'2358',601,55500,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'2360',601,85500,,'',0,8000,,'',0
-'2361',601,85500,,'',0,8000,,'',0
-'2363',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
 '2142',2400,142000,0,'Ctr Loop',0
 '2142',2401,73900,0,'Ctr Loop',0
-'2358',2400,142000,0,'Ctr Loop',0
-'2358',2401,73900,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107501 b/src/main/res-current/raw/current_gtfs_schedule_stop_107501
index 07054b49f..361f225f5 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107501
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107501
@@ -1,13 +1,6 @@
 '2142',1701,62600,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3600,,'',0,8300,,'',0,7900,,'',0,3500,,'',0
-'2358',1701,62600,,'',0,3200,,'',0,8700,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
 '2142',2201,81700,,'',0,62400,,'',0
-'2358',2201,144300,,'',0
-'2360',2201,83500,,'',0
-'2361',2201,80500,,'',0
-'1653',3100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,84500,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,55800,,'',0,7100,,'',0,1200,,'',0,1800,,'',0,5100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1200,,'',0,1000,,'',0,1800,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
 '2144',3100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2357',3100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
-'2358',3100,55800,,'',0,7100,,'',0,1200,,'',0,1800,,'',0,5100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'2363',3100,84500,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107740 b/src/main/res-current/raw/current_gtfs_schedule_stop_107740
index bf3d5c6b1..d36f631a3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107740
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107740
@@ -1,18 +1,8 @@
-'1653',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
-'1653',2101,92300,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2101,92300,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2100,85700,,'',0,15000,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
 '2107',2101,83000,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,13300,,'',0
 '2142',2100,63700,,'',0,7300,,'',0,9200,,'',0,5700,,'',0,15800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
 '2142',2101,62000,,'',0,8000,,'',0,5100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,16800,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10200,,'',0,11800,,'',0,11100,,'',0
 '2144',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12700,,'',0,17000,,'',0
 '2144',2101,92300,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17000,,'',0
-'2357',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12700,,'',0,17300,,'',0
-'2357',2101,92100,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
-'2358',2100,63400,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2358',2101,62400,,'',0,7600,,'',0,14800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17200,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'2360',2100,80200,,'',0
-'2360',2101,75100,,'',0
-'2361',2100,80200,,'',0
-'2361',2101,75100,,'',0
-'2363',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9500,,'',0,9900,,'',0,17100,,'',0
-'2363',2101,75900,,'',0,20000,,'',0,15900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107742 b/src/main/res-current/raw/current_gtfs_schedule_stop_107742
index 46a9529d7..7231fdeb3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107742
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107742
@@ -1,9 +1,4 @@
-'1653',2101,92400,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,92400,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,83200,,'',0,12700,,'',0,16800,,'',0,13200,,'',0,17000,,'',0,12800,,'',0,17100,,'',0,17300,,'',0
 '2142',2101,62200,,'',0,8000,,'',0,5100,,'',0,9700,,'',0,10800,,'',0,16500,,'',0,11600,,'',0,16800,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10200,,'',0,11800,,'',0,11100,,'',0
 '2144',2101,92400,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0
-'2357',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
-'2358',2101,62600,,'',0,7600,,'',0,14800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17200,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'2360',2101,75300,,'',0
-'2361',2101,75300,,'',0
-'2363',2101,80100,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107744 b/src/main/res-current/raw/current_gtfs_schedule_stop_107744
index f069e4ee7..3cc8fd6e3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107744
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107744
@@ -1,9 +1,4 @@
-'1653',2101,92500,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
+'1349',2101,92500,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,13500,,'',0,10000,,'',0,17000,,'',0,12500,,'',0
 '2107',2101,83300,,'',0,16700,,'',0,12800,,'',0,17300,,'',0,13000,,'',0,12800,,'',0,17100,,'',0,17200,,'',0
 '2142',2101,62300,,'',0,8000,,'',0,5200,,'',0,9700,,'',0,14800,,'',0,12500,,'',0,11600,,'',0,16700,,'',0,3400,,'',0,9100,,'',0,8100,,'',0,10300,,'',0,11800,,'',0,11000,,'',0
 '2144',2101,92500,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0
-'2357',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
-'2358',2101,62700,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11000,,'',0
-'2360',2101,75500,,'',0
-'2361',2101,75500,,'',0
-'2363',2101,80300,,'',0,20000,,'',0,11800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,15900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107746 b/src/main/res-current/raw/current_gtfs_schedule_stop_107746
index 749fdd7bd..8a697e4fe 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107746
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107746
@@ -1,18 +1,8 @@
-'1653',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
-'1653',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12700,4,'',0,17000,4,'',0,13500,4,'',0,10000,4,'',0,17000,4,'',0,12500,4,'',0
+'1349',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12700,4,'',0,17000,4,'',0,13500,4,'',0,10000,4,'',0,17000,4,'',0,12500,4,'',0
 '2107',2100,85500,,'',0,15000,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
 '2107',2101,83500,4,'',0,16700,4,'',0,12800,4,'',0,17300,4,'',0,13000,4,'',0,16800,4,'',0,13100,4,'',0,17200,4,'',0
 '2142',2100,63500,,'',0,7300,,'',0,9200,,'',0,5700,,'',0,15800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
 '2142',2101,62500,4,'',0,8000,4,'',0,5200,4,'',0,9700,4,'',0,14800,4,'',0,12500,4,'',0,11600,4,'',0,16800,4,'',0,3400,4,'',0,9100,4,'',0,8100,4,'',0,10200,4,'',0,11800,4,'',0,11000,4,'',0
 '2144',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0
 '2144',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12700,4,'',0,17000,4,'',0
-'2357',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
-'2357',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12700,4,'',0,17300,4,'',0
-'2358',2100,63200,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2358',2101,62900,4,'',0,7600,4,'',0,14900,4,'',0,15900,4,'',0,11400,4,'',0,11600,4,'',0,17200,4,'',0,3200,4,'',0,8900,4,'',0,8400,4,'',0,9900,4,'',0,11800,4,'',0,11000,4,'',0
-'2360',2100,80000,,'',0
-'2360',2101,75700,4,'',0
-'2361',2100,80000,,'',0
-'2361',2101,75700,4,'',0
-'2363',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
-'2363',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19400,4,'',0,11900,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,15800,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107747 b/src/main/res-current/raw/current_gtfs_schedule_stop_107747
index eb59e9d94..fa8080eef 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107747
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107747
@@ -1,9 +1,4 @@
-'1653',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
+'1349',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,17000,,'',0
 '2107',2100,85600,,'',0,15000,,'',0,12800,,'',0,18500,,'',0,13200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
 '2142',2100,63600,,'',0,7300,,'',0,9200,,'',0,5700,,'',0,15800,,'',0,11500,,'',0,11800,,'',0,17100,,'',0,3100,,'',0,9600,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
 '2144',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17000,,'',0
-'2357',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
-'2358',2100,63300,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
-'2360',2100,80100,,'',0
-'2361',2100,80100,,'',0
-'2363',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107751 b/src/main/res-current/raw/current_gtfs_schedule_stop_107751
index 429612856..8e0a50e6d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107751
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107751
@@ -1,43 +1,24 @@
-'1653',3100,201000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,201000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,91000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
 '2142',3100,95500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0
 '2142',3101,171100,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
-'2358',3100,95500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0
-'2358',3101,171100,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
-'2363',3100,91000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
-'1653',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0
+'1349',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0
 '2107',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0
 '2142',3200,95700,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,11400,,'',0,48500,,'',0
 '2142',3201,171100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
 '2144',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,95700,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,11400,,'',0,48500,,'',0
-'2358',3201,171100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
-'2363',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0
-'1653',3300,190700,,'',0
+'1349',3300,190700,,'',0
 '2107',3300,185400,,'',0,10300,,'',0,14500,,'',0
 '2142',3300,61700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,51300,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,10600,,'',0,9900,,'',0
 '2142',3301,170900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
 '2144',3300,190700,,'',0
-'2357',3300,190700,,'',0
-'2358',3300,61700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,51300,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,10600,,'',0,9900,,'',0
-'2358',3301,170900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
-'2363',3300,195700,,'',0,14500,,'',0
 '2142',3400,61800,,'',0,3000,,'',0,7000,,'',0,79400,,'',0,59100,,'',0
 '2142',3401,170900,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'2358',3400,61800,,'',0,3000,,'',0,7000,,'',0,79400,,'',0,59100,,'',0
-'2358',3401,170900,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'1653',3500,95100,,'',0,30300,,'',0,59700,,'',0
+'1349',3500,95100,,'',0,30300,,'',0,59700,,'',0
 '2107',3500,84200,,'',0,67200,,'',0,22000,,'',0
 '2142',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
 '2144',3500,95100,,'',0,30300,,'',0,59700,,'',0
-'2357',3500,95100,,'',0,30300,,'',0,59700,,'',0
-'2358',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
-'2363',3500,84200,,'',0,67200,,'',0,22000,,'',0
-'1653',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
+'1349',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
 '2107',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
 '2142',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
 '2144',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
-'2357',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
-'2358',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
-'2363',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107752 b/src/main/res-current/raw/current_gtfs_schedule_stop_107752
index 0b25e3e9f..ba4064f6e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107752
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107752
@@ -1,21 +1,12 @@
-'1653',3101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,81600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,62600,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,6000,,'',0,1700,,'',0,2800,,'',0,8500,,'',0,16200,,'',0,11000,,'',0
 '2144',3101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,62600,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,6000,,'',0,1700,,'',0,2800,,'',0,8500,,'',0,16200,,'',0,11000,,'',0
-'2363',3101,81600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
-'1653',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'1349',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
 '2107',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '2142',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2357',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2358',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107754 b/src/main/res-current/raw/current_gtfs_schedule_stop_107754
index 31fced506..2c1c479fb 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107754
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107754
@@ -1,14 +1,8 @@
-'1653',3100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',3101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,90400,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
 '2107',3101,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3100,70100,,'',0,3000,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,1700,,'',0,2000,,'',0,900,,'',0,1000,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
 '2142',3101,63200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,6000,,'',0,1200,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,2000,,'',0,1200,,'',0,1700,,'',0,5200,,'',0,1900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
 '2144',3100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
 '2144',3101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
-'2357',3101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,70100,,'',0,3000,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
-'2358',3101,63200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,6000,,'',0,1200,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,2000,,'',0,1200,,'',0,1700,,'',0,5200,,'',0,1900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
-'2363',3100,90400,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2363',3101,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107755 b/src/main/res-current/raw/current_gtfs_schedule_stop_107755
index 386281f2a..26ae13633 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107755
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107755
@@ -1,21 +1,12 @@
-'1653',3100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,90700,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
 '2142',3100,61600,,'',0,3100,,'',0,5700,,'',0,1400,,'',0,1600,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,900,,'',0,5000,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
 '2144',3100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,61600,,'',0,3100,,'',0,5700,,'',0,1400,,'',0,1600,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
-'2363',3100,90700,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
-'1653',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '2142',3200,61600,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
 '2144',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,61600,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'2363',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
-'1653',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,61400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2357',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2358',3300,61400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107756 b/src/main/res-current/raw/current_gtfs_schedule_stop_107756
index ba27e2661..e2958f485 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107756
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107756
@@ -1,45 +1,25 @@
-'1653',3100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,90900,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
 '2142',3100,61700,,'',0,3100,,'',0,5800,,'',0,1300,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,900,,'',0,5000,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11400,,'',0,14900,,'',0
 '2142',3101,171000,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
 '2144',3100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,61700,,'',0,3100,,'',0,5800,,'',0,1300,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11400,,'',0,14900,,'',0
-'2358',3101,171000,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
-'2363',3100,90900,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
-'1653',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
 '2142',3200,61800,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
 '2142',3201,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
 '2144',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,61800,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'2358',3201,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
-'2363',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
-'1653',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
 '2142',3300,61600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0
 '2142',3301,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
 '2144',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2357',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'2358',3300,61600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0
-'2358',3301,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
-'2363',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
 '2142',3400,61700,,'',0,3000,,'',0,7000,,'',0,30600,,'',0,48800,,'',0,59100,,'',0,5700,,'',0
 '2142',3401,171000,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'2358',3400,61700,,'',0,3000,,'',0,7000,,'',0,30600,,'',0,48800,,'',0,59100,,'',0,5700,,'',0
-'2358',3401,171000,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'1653',3501,93300,,'',0,30300,,'',0,59800,,'',0
+'1349',3501,93300,,'',0,30300,,'',0,59800,,'',0
 '2107',3501,82500,,'',0,63100,,'',0,26000,,'',0
 '2142',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2144',3501,93300,,'',0,30300,,'',0,59800,,'',0
-'2357',3501,93300,,'',0,30300,,'',0,59800,,'',0
-'2358',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2363',3501,82500,,'',0,63100,,'',0,26000,,'',0
-'1653',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'1349',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
 '2107',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
 '2142',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2357',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2358',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107758 b/src/main/res-current/raw/current_gtfs_schedule_stop_107758
index 6ccd7907a..e0cf2fa65 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107758
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107758
@@ -1,7 +1,4 @@
-'1653',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,55900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,55900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107759 b/src/main/res-current/raw/current_gtfs_schedule_stop_107759
index 5fd8e924a..f197bd95d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107759
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107759
@@ -1,14 +1,8 @@
-'1653',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107761 b/src/main/res-current/raw/current_gtfs_schedule_stop_107761
index e6633ee3a..bcb244c85 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107761
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107761
@@ -1,14 +1,8 @@
-'1653',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107762 b/src/main/res-current/raw/current_gtfs_schedule_stop_107762
index b545d318f..07877cecf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107762
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107762
@@ -1,14 +1,8 @@
-'1653',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107763 b/src/main/res-current/raw/current_gtfs_schedule_stop_107763
index bddfff665..03f7f1fe7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107763
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107763
@@ -1,14 +1,8 @@
-'1653',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107764 b/src/main/res-current/raw/current_gtfs_schedule_stop_107764
index 872b2a643..da24bca06 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107764
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107764
@@ -1,14 +1,8 @@
-'1653',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107765 b/src/main/res-current/raw/current_gtfs_schedule_stop_107765
index e305667cb..68e809fd9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107765
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107765
@@ -1,14 +1,8 @@
-'1653',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107766 b/src/main/res-current/raw/current_gtfs_schedule_stop_107766
index 2707260ed..6cc810124 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107766
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107766
@@ -1,14 +1,8 @@
-'1653',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107767 b/src/main/res-current/raw/current_gtfs_schedule_stop_107767
index 7bccccda3..89427cd87 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107767
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107767
@@ -1,7 +1,4 @@
-'1653',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107768 b/src/main/res-current/raw/current_gtfs_schedule_stop_107768
index 7bccccda3..89427cd87 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107768
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107768
@@ -1,7 +1,4 @@
-'1653',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107769 b/src/main/res-current/raw/current_gtfs_schedule_stop_107769
index fc18985d6..9ff5c7346 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107769
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107769
@@ -1,7 +1,4 @@
-'1653',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107770 b/src/main/res-current/raw/current_gtfs_schedule_stop_107770
index c3aa840d8..438202649 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107770
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107770
@@ -1,7 +1,4 @@
-'1653',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107771 b/src/main/res-current/raw/current_gtfs_schedule_stop_107771
index b638502f2..f36ed522c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107771
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107771
@@ -1,7 +1,4 @@
-'1653',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107772 b/src/main/res-current/raw/current_gtfs_schedule_stop_107772
index b638502f2..f36ed522c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107772
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107772
@@ -1,7 +1,4 @@
-'1653',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107773 b/src/main/res-current/raw/current_gtfs_schedule_stop_107773
index 39cb9e49e..e1ca41a38 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107773
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107773
@@ -1,14 +1,8 @@
-'1653',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2107',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
 '2142',3200,60800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2142',3201,60800,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7900,4,'',0,7700,4,'',0,3400,4,'',0,8000,4,'',0,7400,4,'',0,3700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,9200,4,'',0,10800,4,'',0
 '2144',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
 '2144',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2357',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
-'2358',3200,60800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2358',3201,60800,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7900,4,'',0,7700,4,'',0,3400,4,'',0,8000,4,'',0,7400,4,'',0,3700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,9200,4,'',0,10800,4,'',0
-'2363',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2363',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107774 b/src/main/res-current/raw/current_gtfs_schedule_stop_107774
index 74c107ac5..3246ea77f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107774
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107774
@@ -1,7 +1,4 @@
-'1653',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,60900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3200,60900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107775 b/src/main/res-current/raw/current_gtfs_schedule_stop_107775
index 8d5307118..746d67f94 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107775
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107775
@@ -1,7 +1,4 @@
-'1653',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107776 b/src/main/res-current/raw/current_gtfs_schedule_stop_107776
index 4a5559f32..f10e67b1e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107776
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107776
@@ -1,7 +1,4 @@
-'1653',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107777 b/src/main/res-current/raw/current_gtfs_schedule_stop_107777
index 4ee999e19..180481631 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107777
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107777
@@ -1,7 +1,4 @@
-'1653',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,61100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107778 b/src/main/res-current/raw/current_gtfs_schedule_stop_107778
index 8a9e73fb8..3cd915858 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107778
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107778
@@ -1,7 +1,4 @@
-'1653',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
 '2144',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3200,61200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'2363',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107779 b/src/main/res-current/raw/current_gtfs_schedule_stop_107779
index c978e0a75..4490e5543 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107779
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107779
@@ -1,7 +1,4 @@
-'1653',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,61200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107781 b/src/main/res-current/raw/current_gtfs_schedule_stop_107781
index 7d11a3ba7..de7760f02 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107781
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107781
@@ -1,7 +1,4 @@
-'1653',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107783 b/src/main/res-current/raw/current_gtfs_schedule_stop_107783
index a17052329..d463e7c2f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107783
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107783
@@ -1,7 +1,4 @@
-'1653',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'1349',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
 '2107',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2142',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2357',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2358',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107786 b/src/main/res-current/raw/current_gtfs_schedule_stop_107786
index a1be43c64..c620912c0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107786
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107786
@@ -1,7 +1,4 @@
-'1653',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107787 b/src/main/res-current/raw/current_gtfs_schedule_stop_107787
index c28642a9b..d69dc06f6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107787
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107787
@@ -1,14 +1,8 @@
-'1653',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
 '2144',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
-'2363',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'1653',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
 '2144',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'2363',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107788 b/src/main/res-current/raw/current_gtfs_schedule_stop_107788
index 328973b64..c865a16cd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107788
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107788
@@ -1,14 +1,8 @@
-'1653',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'1653',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107789 b/src/main/res-current/raw/current_gtfs_schedule_stop_107789
index 328973b64..c865a16cd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107789
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107789
@@ -1,14 +1,8 @@
-'1653',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'1653',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107790 b/src/main/res-current/raw/current_gtfs_schedule_stop_107790
index 198f76911..877646bca 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107790
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107790
@@ -1,7 +1,4 @@
-'1653',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107791 b/src/main/res-current/raw/current_gtfs_schedule_stop_107791
index 43aa68fec..80594d225 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107791
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107791
@@ -1,7 +1,4 @@
-'1653',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107792 b/src/main/res-current/raw/current_gtfs_schedule_stop_107792
index 4022bc942..4160107ba 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107792
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107792
@@ -1,7 +1,4 @@
-'1653',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107793 b/src/main/res-current/raw/current_gtfs_schedule_stop_107793
index 66141b1e0..253d6bed8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107793
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107793
@@ -1,7 +1,4 @@
-'1653',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,60100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,60100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107794 b/src/main/res-current/raw/current_gtfs_schedule_stop_107794
index 69b9be460..c0572af5d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107794
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107794
@@ -1,14 +1,8 @@
-'1653',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'1653',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107795 b/src/main/res-current/raw/current_gtfs_schedule_stop_107795
index 3ca796f2b..8526c94ae 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107795
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107795
@@ -1,7 +1,4 @@
-'1653',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2358',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107796 b/src/main/res-current/raw/current_gtfs_schedule_stop_107796
index 74aa3240a..c64c79ddc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107796
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107796
@@ -1,7 +1,4 @@
-'1653',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107797 b/src/main/res-current/raw/current_gtfs_schedule_stop_107797
index 847d41ac2..99fad5e37 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107797
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107797
@@ -1,7 +1,4 @@
-'1653',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2358',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107798 b/src/main/res-current/raw/current_gtfs_schedule_stop_107798
index cac250ae9..52d6c91ec 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107798
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107798
@@ -1,7 +1,4 @@
-'1653',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3301,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2358',3301,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107800 b/src/main/res-current/raw/current_gtfs_schedule_stop_107800
index e84a87e68..d0f335de7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107800
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107800
@@ -1,7 +1,4 @@
-'1653',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2358',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107801 b/src/main/res-current/raw/current_gtfs_schedule_stop_107801
index 833cf3fa2..3951575e3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107801
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107801
@@ -1,7 +1,4 @@
-'1653',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
-'2357',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
-'2358',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107802 b/src/main/res-current/raw/current_gtfs_schedule_stop_107802
index 1528b1cc3..4bf77b155 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107802
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107802
@@ -1,7 +1,4 @@
-'1653',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2358',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107803 b/src/main/res-current/raw/current_gtfs_schedule_stop_107803
index 656e8a048..4cdf3c8c2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107803
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107803
@@ -1,7 +1,4 @@
-'1653',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2357',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2358',3300,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107804 b/src/main/res-current/raw/current_gtfs_schedule_stop_107804
index 8c39f7be2..8fd231167 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107804
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107804
@@ -1,7 +1,4 @@
-'1653',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
-'2357',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
-'2358',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107805 b/src/main/res-current/raw/current_gtfs_schedule_stop_107805
index 014eb6f80..f7750384a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107805
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107805
@@ -1,7 +1,4 @@
-'1653',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2357',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2358',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107806 b/src/main/res-current/raw/current_gtfs_schedule_stop_107806
index 95ec11644..c04e101f4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107806
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107806
@@ -1,7 +1,4 @@
-'1653',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2357',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
-'2358',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107807 b/src/main/res-current/raw/current_gtfs_schedule_stop_107807
index dfff5e42c..ca4011346 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107807
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107807
@@ -1,7 +1,4 @@
-'1653',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
-'2357',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
-'2358',3300,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107808 b/src/main/res-current/raw/current_gtfs_schedule_stop_107808
index 80b6e13ff..986f102e3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107808
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107808
@@ -1,4 +1,4 @@
-'1653',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,83800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
 '2142',3300,61300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
 '2144',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107817 b/src/main/res-current/raw/current_gtfs_schedule_stop_107817
index d88ce4add..bc43b318b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107817
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107817
@@ -1,7 +1,4 @@
-'1653',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107818 b/src/main/res-current/raw/current_gtfs_schedule_stop_107818
index eb4e3b805..a15ec5af1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107818
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107818
@@ -1,7 +1,4 @@
-'1653',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107819 b/src/main/res-current/raw/current_gtfs_schedule_stop_107819
index d95900d44..b7ec34c53 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107819
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107819
@@ -1,18 +1,10 @@
-'1653',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
 '2144',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
-'2363',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'1653',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0
 '2107',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2142',3400,95300,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0
 '2142',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3400,95300,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0
-'2358',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
-'2363',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107820 b/src/main/res-current/raw/current_gtfs_schedule_stop_107820
index ee891921c..16ae6e9a9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107820
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107820
@@ -1,7 +1,4 @@
-'1653',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2142',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107822 b/src/main/res-current/raw/current_gtfs_schedule_stop_107822
index ed921c538..d34736447 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107822
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107822
@@ -1,7 +1,4 @@
-'1653',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107823 b/src/main/res-current/raw/current_gtfs_schedule_stop_107823
index 39fcbb1ee..d3e2750c6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107823
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107823
@@ -1,7 +1,4 @@
-'1653',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107824 b/src/main/res-current/raw/current_gtfs_schedule_stop_107824
index 64f80a0c2..4ed070ad3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107824
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107824
@@ -1,7 +1,4 @@
-'1653',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2142',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
 '2144',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
-'2363',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107825 b/src/main/res-current/raw/current_gtfs_schedule_stop_107825
index 32e3c21b7..785f0e24b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107825
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107825
@@ -1,7 +1,4 @@
-'1653',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107826 b/src/main/res-current/raw/current_gtfs_schedule_stop_107826
index e56efaf37..aca16ed98 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107826
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107826
@@ -1,7 +1,4 @@
-'1653',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107827 b/src/main/res-current/raw/current_gtfs_schedule_stop_107827
index a2b3c882b..b3d19a9da 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107827
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107827
@@ -1,7 +1,4 @@
-'1653',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107828 b/src/main/res-current/raw/current_gtfs_schedule_stop_107828
index e978c25b9..34485e424 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107828
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107828
@@ -1,7 +1,4 @@
-'1653',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107829 b/src/main/res-current/raw/current_gtfs_schedule_stop_107829
index f4871e4e8..96987869f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107829
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107829
@@ -1,7 +1,4 @@
-'1653',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107830 b/src/main/res-current/raw/current_gtfs_schedule_stop_107830
index 9f8dd0072..7d29afc64 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107830
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107830
@@ -1,7 +1,4 @@
-'1653',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107831 b/src/main/res-current/raw/current_gtfs_schedule_stop_107831
index 56a373062..0355d40f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107831
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107831
@@ -1,7 +1,4 @@
-'1653',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3401,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107832 b/src/main/res-current/raw/current_gtfs_schedule_stop_107832
index c99ecf720..cb08085d9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107832
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107832
@@ -1,7 +1,4 @@
-'1653',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107833 b/src/main/res-current/raw/current_gtfs_schedule_stop_107833
index c46289abc..278f762a8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107833
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107833
@@ -1,7 +1,4 @@
-'1653',3401,82700,,'',0,17400,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82700,,'',0,17400,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,75400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82700,,'',0,17400,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3401,82700,,'',0,17400,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,75400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107834 b/src/main/res-current/raw/current_gtfs_schedule_stop_107834
index 84451fc40..259746f1a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107834
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107834
@@ -1,14 +1,8 @@
-'1653',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2107',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
 '2142',3400,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2142',3401,60500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,4000,4,'',0,7400,4,'',0,7800,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,3900,4,'',0,9700,4,'',0,9700,4,'',0
 '2144',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
 '2144',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
-'2357',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
-'2358',3400,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2358',3401,60500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,4000,4,'',0,7400,4,'',0,7800,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,3900,4,'',0,9700,4,'',0,9700,4,'',0
-'2363',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2363',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107835 b/src/main/res-current/raw/current_gtfs_schedule_stop_107835
index 33e1ab5b7..02a9dc2bd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107835
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107835
@@ -1,7 +1,4 @@
-'1653',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107836 b/src/main/res-current/raw/current_gtfs_schedule_stop_107836
index e08c12074..92a186107 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107836
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107836
@@ -1,7 +1,4 @@
-'1653',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107838 b/src/main/res-current/raw/current_gtfs_schedule_stop_107838
index 3752e5897..aa98d820f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107838
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107838
@@ -1,7 +1,4 @@
-'1653',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107839 b/src/main/res-current/raw/current_gtfs_schedule_stop_107839
index 6fdcca53e..3ea1849d6 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107839
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107839
@@ -1,7 +1,4 @@
-'1653',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107840 b/src/main/res-current/raw/current_gtfs_schedule_stop_107840
index c693626ad..07c3afcc0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107840
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107840
@@ -1,7 +1,4 @@
-'1653',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107841 b/src/main/res-current/raw/current_gtfs_schedule_stop_107841
index 6ae50b167..19da2e872 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107841
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107841
@@ -1,7 +1,4 @@
-'1653',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107842 b/src/main/res-current/raw/current_gtfs_schedule_stop_107842
index 5a8808edf..2fcded2fd 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107842
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107842
@@ -1,7 +1,4 @@
-'1653',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107843 b/src/main/res-current/raw/current_gtfs_schedule_stop_107843
index 72f4865f7..42bafc2fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107843
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107843
@@ -1,7 +1,4 @@
-'1653',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
 '2144',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'2363',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107844 b/src/main/res-current/raw/current_gtfs_schedule_stop_107844
index a4501b328..4c879b48c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107844
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107844
@@ -1,7 +1,4 @@
-'1653',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
 '2144',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'2363',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107845 b/src/main/res-current/raw/current_gtfs_schedule_stop_107845
index e4187a3ff..49e02c8ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107845
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107845
@@ -1,7 +1,4 @@
-'1653',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
 '2144',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'2363',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107846 b/src/main/res-current/raw/current_gtfs_schedule_stop_107846
index e4187a3ff..49e02c8ed 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107846
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107846
@@ -1,7 +1,4 @@
-'1653',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
 '2144',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'2363',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107847 b/src/main/res-current/raw/current_gtfs_schedule_stop_107847
index feec6fa09..9f0664d8e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107847
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107847
@@ -1,7 +1,4 @@
-'1653',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
 '2144',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
-'2363',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107849 b/src/main/res-current/raw/current_gtfs_schedule_stop_107849
index 077acda82..2c5f14a67 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107849
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107849
@@ -1,7 +1,4 @@
-'1653',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107850 b/src/main/res-current/raw/current_gtfs_schedule_stop_107850
index 50b9c7604..a253b6e22 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107850
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107850
@@ -1,7 +1,4 @@
-'1653',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107851 b/src/main/res-current/raw/current_gtfs_schedule_stop_107851
index 8b7392360..64021e5f9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107851
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107851
@@ -1,7 +1,4 @@
-'1653',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107855 b/src/main/res-current/raw/current_gtfs_schedule_stop_107855
index 5782f20ed..38cecf426 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107855
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107855
@@ -1,14 +1,8 @@
-'1653',3500,93900,,'',0,30300,,'',0,59700,,'',0
-'1653',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
+'1349',3500,93900,,'',0,30300,,'',0,59700,,'',0
+'1349',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
 '2107',3500,83000,,'',0,67200,,'',0,22000,,'',0
 '2107',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
 '2142',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2142',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
 '2144',3500,93900,,'',0,30300,,'',0,59700,,'',0
 '2144',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
-'2357',3500,93900,,'',0,30300,,'',0,59700,,'',0
-'2357',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
-'2358',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2358',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
-'2363',3500,83000,,'',0,67200,,'',0,22000,,'',0
-'2363',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107856 b/src/main/res-current/raw/current_gtfs_schedule_stop_107856
index 4f0771a06..2fdc23ca0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107856
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107856
@@ -1,7 +1,4 @@
-'1653',3500,94300,,'',0,30300,,'',0,59700,,'',0
+'1349',3500,94300,,'',0,30300,,'',0,59700,,'',0
 '2107',3500,83400,,'',0,67200,,'',0,22000,,'',0
 '2142',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2144',3500,94300,,'',0,30300,,'',0,59700,,'',0
-'2357',3500,94300,,'',0,30300,,'',0,59700,,'',0
-'2358',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2363',3500,83400,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107857 b/src/main/res-current/raw/current_gtfs_schedule_stop_107857
index cdbf1ba6e..2ddcf2a5e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107857
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107857
@@ -1,7 +1,4 @@
-'1653',3500,94500,,'',0,30300,,'',0,59700,,'',0
+'1349',3500,94500,,'',0,30300,,'',0,59700,,'',0
 '2107',3500,83600,,'',0,67200,,'',0,22000,,'',0
 '2142',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2144',3500,94500,,'',0,30300,,'',0,59700,,'',0
-'2357',3500,94500,,'',0,30300,,'',0,59700,,'',0
-'2358',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2363',3500,83600,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107859 b/src/main/res-current/raw/current_gtfs_schedule_stop_107859
index 9803ed155..a75ad8985 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107859
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107859
@@ -1,7 +1,4 @@
-'1653',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107861 b/src/main/res-current/raw/current_gtfs_schedule_stop_107861
index 39add8e88..8dd96fd94 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107861
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107861
@@ -1,7 +1,4 @@
-'1653',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107870 b/src/main/res-current/raw/current_gtfs_schedule_stop_107870
index ffa12cc6c..9a579edfa 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107870
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107870
@@ -1,14 +1,8 @@
-'1653',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,61300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
 '2144',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2357',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'2358',3200,61300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
-'2363',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107871 b/src/main/res-current/raw/current_gtfs_schedule_stop_107871
index f1ac772ca..cf4863816 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107871
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107871
@@ -1,14 +1,8 @@
-'1653',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
 '2142',3200,61400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
 '2144',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3200,61400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'2363',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
-'1653',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107877 b/src/main/res-current/raw/current_gtfs_schedule_stop_107877
index fedc4a5b7..277d4726d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107877
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107877
@@ -1,7 +1,4 @@
-'1653',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
 '2142',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107880 b/src/main/res-current/raw/current_gtfs_schedule_stop_107880
index e6633ee3a..bcb244c85 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107880
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107880
@@ -1,14 +1,8 @@
-'1653',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107883 b/src/main/res-current/raw/current_gtfs_schedule_stop_107883
index 9dbf156cc..5fc162693 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107883
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107883
@@ -1,14 +1,8 @@
-'1653',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2144',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2363',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'1653',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8200,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
 '2144',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2357',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
-'2358',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8200,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
-'2363',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_107884 b/src/main/res-current/raw/current_gtfs_schedule_stop_107884
index de81d07cf..1e9f5f707 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_107884
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_107884
@@ -1,7 +1,4 @@
-'1653',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2142',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
 '2144',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
-'2363',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_108262 b/src/main/res-current/raw/current_gtfs_schedule_stop_108262
index 1ac553873..98bab83b4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_108262
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_108262
@@ -1,50 +1,28 @@
-'1653',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,7800,4,'',0
+'1349',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0,7300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,7800,4,'',0
 '2107',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
-'1653',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,3800,4,'',0
+'1349',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,3800,4,'',0
 '2107',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,55700,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,7100,0,'McMillan',0,2200,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,6900,0,'McMillan',0
 '2144',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,55600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',300,64000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9200,4,'',0
+'1349',300,64000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9200,4,'',0
 '2107',300,55600,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,55300,,'',0,7300,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,64000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,5000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,55300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2144',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2363',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,63500,,'',0,9600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9700,,'',0,9700,,'',0,9500,,'',0
 '2142',501,60400,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,7400,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9600,,'',0
 '2144',501,61900,,'',0,9900,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,4900,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'2363',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'1653',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2144',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2363',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
-'1653',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
+'1349',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,17300,,'',0
 '2107',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2144',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2363',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'2358',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
 '2142',2600,141500,0,'Sandy Hl',0
 '2142',2601,73100,0,'Sandy Hl',0
-'2358',2601,73100,0,'Sandy Hl',0,68400,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120002 b/src/main/res-current/raw/current_gtfs_schedule_stop_120002
index e6f532f0b..734b2da3e 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120002
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120002
@@ -1,32 +1,16 @@
-'1653',100,60500,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
-'1653',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
+'1349',100,60500,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0
 '2107',100,60700,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
 '2107',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
 '2142',100,52400,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,2300,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2142',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,2800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,2600,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2100,4,'',0,6000,4,'',0,800,4,'',0,1300,4,'',0,2100,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5800,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2500,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0
 '2144',100,60500,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
 '2144',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
-'2357',100,60500,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
-'2358',100,52400,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2358',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,2800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6000,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2100,4,'',0,6000,4,'',0,800,4,'',0,1300,4,'',0,2100,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2600,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0
-'2363',100,60700,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
-'2363',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
-'1653',200,61700,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
-'1653',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0
+'1349',200,61700,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0
 '2107',200,60000,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2107',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
 '2142',200,53500,0,'McMillan',0,2400,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2700,0,'McMillan',0,2400,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2142',201,55700,4,'',0,7100,4,'',0,2800,4,'',0,7000,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2000,4,'',0,5800,4,'',0,2000,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2700,4,'',0,2400,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,5700,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,5700,4,'',0,2000,4,'',0,2000,4,'',0,6300,4,'',0,2300,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,3000,4,'',0
 '2144',200,61700,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
 '2144',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
-'2357',200,61700,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
-'2357',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
-'2358',200,53500,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2358',201,55300,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,9700,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5500,4,'',0,3900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2300,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,3000,4,'',0
-'2360',200,111000,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
-'2360',201,110800,4,'',0,14000,4,'',0,18200,4,'',0,20000,4,'',0
-'2361',200,111000,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
-'2361',201,110800,4,'',0,14000,4,'',0,18200,4,'',0,20000,4,'',0
-'2363',200,60000,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
-'2363',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120006 b/src/main/res-current/raw/current_gtfs_schedule_stop_120006
index 8d6bc0a6e..92d8b7692 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120006
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120006
@@ -1,7 +1,4 @@
 '2107',1501,90500,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62200,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62100,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'2363',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'2142',2600,145000,0,'Montrose Exch Only',0
+'2142',2600,145000,,'',0
 '2142',2601,81300,,'',0
-'2358',2600,81300,,'',0,63700,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120007 b/src/main/res-current/raw/current_gtfs_schedule_stop_120007
index 7884136b1..978210358 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120007
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120007
@@ -1,21 +1,12 @@
-'1653',3101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,81800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,62800,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1400,,'',0,1800,,'',0,5500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
 '2144',3101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,62800,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1400,,'',0,1800,,'',0,5500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
-'2363',3101,81800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'1653',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3201,55800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
 '2144',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3201,55800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'2363',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'1349',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
 '2107',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2142',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2357',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2358',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120011 b/src/main/res-current/raw/current_gtfs_schedule_stop_120011
index dd3160900..7c82ec3bf 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120011
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120011
@@ -1,2 +1 @@
 '2142',1601,80300,,'',0,12000,,'',0,68600,,'',0,4500,,'',0
-'2358',1601,80500,,'',0,11900,,'',0,68500,,'',0,4500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120012 b/src/main/res-current/raw/current_gtfs_schedule_stop_120012
index 27a883450..b0ec0eda8 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120012
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120012
@@ -1,4 +1 @@
 '2142',2201,83200,,'',0,66800,,'',0
-'2358',2201,150600,,'',0
-'2360',2201,85200,,'',0
-'2361',2201,82200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120013 b/src/main/res-current/raw/current_gtfs_schedule_stop_120013
index 3777c7b3e..9e2052181 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120013
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120013
@@ -1,4 +1,2 @@
 '2107',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
 '2142',3100,61000,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,2900,,'',0,1000,,'',0,5800,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
-'2358',3100,61000,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,3300,,'',0,900,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
-'2363',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120014 b/src/main/res-current/raw/current_gtfs_schedule_stop_120014
index f049421d2..bf8689963 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120014
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120014
@@ -1,7 +1,4 @@
-'1653',3101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3101,82700,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
 '2142',3101,63800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1900,,'',0,1300,,'',0,1600,,'',0,5200,,'',0,1800,,'',0,1800,,'',0,6800,,'',0,4500,,'',0,16300,,'',0,10800,,'',0
 '2144',3101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3101,63800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1900,,'',0,1300,,'',0,1600,,'',0,5200,,'',0,1800,,'',0,1800,,'',0,6800,,'',0,4500,,'',0,16300,,'',0,10800,,'',0
-'2363',3101,82700,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120016 b/src/main/res-current/raw/current_gtfs_schedule_stop_120016
index 89a6febec..316a15e36 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120016
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120016
@@ -1,7 +1,4 @@
 '2107',1500,92700,,'',0,20100,,'',0,40000,,'',0,19900,,'',0
 '2142',1500,64300,,'',0,8300,,'',0,12000,,'',0,68400,,'',0,20300,,'',0,8900,,'',0
-'2358',1500,64400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
 '2142',2600,143200,0,'Sandy Hl',0
 '2142',2601,75700,0,'Sandy Hl',0
-'2358',2601,75700,0,'Sandy Hl',0,67500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120017 b/src/main/res-current/raw/current_gtfs_schedule_stop_120017
index 894da5296..6d0555630 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120017
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120017
@@ -1,2 +1 @@
-'2142',2600,145400,0,'Montrose Exch Only',0
-'2358',2600,145400,0,'Montrose Exch Only',0
+'2142',2600,145400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120018 b/src/main/res-current/raw/current_gtfs_schedule_stop_120018
index b477b80b1..4eca97605 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120018
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120018
@@ -1,2 +1 @@
 '2142',2400,142300,0,'Ctr Loop',0
-'2358',2400,142300,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120022 b/src/main/res-current/raw/current_gtfs_schedule_stop_120022
index 5700ec8c7..ab61580ad 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120022
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120022
@@ -1,7 +1,4 @@
-'1653',701,63000,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
+'1349',701,63000,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,0,'Montrose Exch',0
 '2107',701,63200,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,64600,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
 '2144',701,63000,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63000,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,64600,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'2363',701,63200,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120023 b/src/main/res-current/raw/current_gtfs_schedule_stop_120023
index 483be7fa2..0d07c493a 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120023
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120023
@@ -1,25 +1,12 @@
-'1653',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
+'1349',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'Bourquin Exch Only',0
 '2107',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54900,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,54800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112700,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2361',200,112700,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
-'2363',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
-'1653',301,63400,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',301,63400,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',301,65500,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9600,,'',0,9500,,'',0
 '2142',301,60600,,'',0,5100,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3400,,'',0,7400,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,4500,,'',0,8500,,'',0,9800,,'',0
 '2144',301,63400,,'',0,10700,,'',0,10100,,'',0,9600,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,5000,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0
-'2357',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
-'2358',301,60600,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'2363',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'1653',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
+'1349',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0
 '2107',601,62100,,'',0,12000,,'',0,10200,,'',0,9800,,'',0,10600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
 '2142',601,61300,,'',0,4600,,'',0,7200,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7800,,'',0,11600,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4400,,'',0,15400,,'',0,5900,,'',0,15500,,'',0,11000,,'',0
 '2144',601,61800,,'',0,13000,,'',0,10000,,'',0,10600,,'',0,9100,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9300,,'',0,4900,,'',0,9000,,'',0,11900,,'',0,16000,,'',0
-'2357',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
-'2358',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'2360',601,91700,,'',0,4000,,'',0
-'2361',601,91700,,'',0,4000,,'',0
-'2363',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120024 b/src/main/res-current/raw/current_gtfs_schedule_stop_120024
index fe08627f6..999fb0933 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120024
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120024
@@ -1,9 +1,5 @@
-'1653',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
+'1349',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,0,'Montrose Exch Only',0
 '2107',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2357',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
-'2358',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
 '2142',1200,73300,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
-'2358',1200,73300,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120026 b/src/main/res-current/raw/current_gtfs_schedule_stop_120026
index fe081ff81..6b2021b43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120026
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120026
@@ -1,4 +1,2 @@
 '2107',1501,91100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120027 b/src/main/res-current/raw/current_gtfs_schedule_stop_120027
index fe081ff81..6b2021b43 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120027
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120027
@@ -1,4 +1,2 @@
 '2107',1501,91100,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120028 b/src/main/res-current/raw/current_gtfs_schedule_stop_120028
index 81b317f27..a757fa7d1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120028
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120028
@@ -1,4 +1,2 @@
 '2107',1500,92200,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,63800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2358',1500,63800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'2363',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120031 b/src/main/res-current/raw/current_gtfs_schedule_stop_120031
index a27d49c9f..25a3a08ac 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120031
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120031
@@ -1,7 +1,4 @@
-'1653',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'1349',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
 '2107',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
 '2142',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2357',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'2358',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120032 b/src/main/res-current/raw/current_gtfs_schedule_stop_120032
index 20b4fc6e2..474b67776 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120032
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120032
@@ -1,2 +1 @@
 '2142',2401,80800,0,'Ctr Loop',0
-'2358',2401,80800,0,'Ctr Loop',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120033 b/src/main/res-current/raw/current_gtfs_schedule_stop_120033
index 0715f8ec0..0cfcdafc9 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120033
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120033
@@ -1,9 +1,4 @@
-'1653',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2142',201,55200,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,110200,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,110200,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120034 b/src/main/res-current/raw/current_gtfs_schedule_stop_120034
index 55501bb74..b35e8b186 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120034
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120034
@@ -1,9 +1,4 @@
-'1653',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2142',201,55300,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2400,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,110300,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,110300,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120035 b/src/main/res-current/raw/current_gtfs_schedule_stop_120035
index 6f4535cce..8d99685e1 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120035
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120035
@@ -1,9 +1,4 @@
-'1653',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
 '2142',201,55500,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,2400,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
-'2357',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
-'2358',201,55100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,110500,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,110500,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120037 b/src/main/res-current/raw/current_gtfs_schedule_stop_120037
index aa1167bfe..bcb068881 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120037
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120037
@@ -1,9 +1,4 @@
-'1653',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54700,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105700,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105700,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120038 b/src/main/res-current/raw/current_gtfs_schedule_stop_120038
index 82a2f76ba..0d351059b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120038
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120038
@@ -1,9 +1,4 @@
-'1653',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,54200,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2900,0,'McMillan',0,6300,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54200,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18700,0,'McMillan',0,19500,0,'McMillan',0
-'2361',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18700,0,'McMillan',0,19500,0,'McMillan',0
-'2363',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120039 b/src/main/res-current/raw/current_gtfs_schedule_stop_120039
index c6c956187..c3e10f856 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120039
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120039
@@ -1,9 +1,4 @@
-'1653',200,62500,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62500,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60800,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54200,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62500,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62500,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54200,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111900,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111900,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60800,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120040 b/src/main/res-current/raw/current_gtfs_schedule_stop_120040
index 2aabdb522..19a98056f 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120040
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120040
@@ -1,9 +1,4 @@
-'1653',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54300,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120041 b/src/main/res-current/raw/current_gtfs_schedule_stop_120041
index 58e467c89..1ea655f74 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120041
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120041
@@ -1,9 +1,4 @@
-'1653',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54400,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2357',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'2358',201,54000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105300,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2361',201,105300,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
-'2363',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120042 b/src/main/res-current/raw/current_gtfs_schedule_stop_120042
index b87260290..f92a07956 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120042
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120042
@@ -1,9 +1,4 @@
-'1653',200,62300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60600,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,54100,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54100,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111700,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111700,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60600,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120043 b/src/main/res-current/raw/current_gtfs_schedule_stop_120043
index 93d5c8dc8..427f2056c 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120043
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120043
@@ -1,18 +1,8 @@
-'1653',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0,9000,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0
-'1653',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0,9000,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0,8500,4,'',0,4500,4,'',0,8500,4,'',0,8500,4,'',0
+'1349',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
 '2107',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
 '2142',200,60800,4,'',0,2500,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,2100,4,'',0,2000,4,'',0,5800,4,'',0,1900,4,'',0,1800,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2400,4,'',0,2500,4,'',0,6600,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,2600,4,'',0,6700,4,'',0,2600,4,'',0,7000,4,'',0,2100,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,1700,4,'',0,6000,4,'',0,1800,4,'',0,1800,4,'',0,5900,4,'',0,2000,4,'',0,1700,4,'',0,5800,4,'',0,2000,4,'',0,2300,4,'',0,6300,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
 '2142',201,51700,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,5900,,'',0,1800,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6300,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
 '2144',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
-'2357',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',200,60700,4,'',0,2300,4,'',0,7100,4,'',0,3400,4,'',0,6800,4,'',0,2200,4,'',0,2100,4,'',0,5700,4,'',0,1800,4,'',0,2100,4,'',0,5900,4,'',0,2000,4,'',0,2200,4,'',0,5800,4,'',0,2500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,5000,4,'',0,6700,4,'',0,2700,4,'',0,9500,4,'',0,5800,4,'',0,1800,4,'',0,2000,4,'',0,1500,4,'',0,7800,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6800,4,'',0,2900,4,'',0
-'2358',201,51300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,8900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,4000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',200,115100,4,'',0,18000,4,'',0,19100,4,'',0,19400,4,'',0
-'2360',201,102200,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2361',200,115100,4,'',0,18000,4,'',0,19100,4,'',0,19400,4,'',0
-'2361',201,102200,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
-'2363',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
-'2363',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120044 b/src/main/res-current/raw/current_gtfs_schedule_stop_120044
index 25d000e39..a12f2bb37 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120044
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120044
@@ -1,9 +1,4 @@
-'1653',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
 '2142',201,54900,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,6400,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2357',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
-'2358',201,54500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,105900,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,105900,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120045 b/src/main/res-current/raw/current_gtfs_schedule_stop_120045
index b96c7ca02..e4cd0a235 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120045
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120045
@@ -1,9 +1,4 @@
-'1653',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
 '2142',200,54100,0,'McMillan',0,6500,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120046 b/src/main/res-current/raw/current_gtfs_schedule_stop_120046
index ec5612a4a..92c26a6fc 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120046
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120046
@@ -1,16 +1,8 @@
-'1653',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1349',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
 '2107',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
 '2142',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
-'2357',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
-'2358',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
-'1653',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1349',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
 '2107',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
 '2142',201,55600,,'',0,7100,,'',0,2800,,'',0,7000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,2400,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5700,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
 '2144',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
-'2357',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
-'2358',201,55200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'2360',201,110700,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2361',201,110700,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
-'2363',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120047 b/src/main/res-current/raw/current_gtfs_schedule_stop_120047
index 81a3d637f..97b83da19 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120047
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120047
@@ -1,7 +1,4 @@
-'1653',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
+'1349',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,6800,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'Bourquin Exch Only',0
 '2107',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
 '2142',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2600,0,'UFV',0,6300,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
 '2144',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
-'2363',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120048 b/src/main/res-current/raw/current_gtfs_schedule_stop_120048
index fed191aff..c98590eb3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120048
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120048
@@ -1,7 +1,4 @@
-'1653',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
 '2142',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
 '2144',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2357',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
-'2358',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'2363',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120049 b/src/main/res-current/raw/current_gtfs_schedule_stop_120049
index 149fddff3..bc19d6374 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120049
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120049
@@ -1,13 +1,5 @@
-'1653',200,62200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
+'1349',200,62200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'Bourquin Exch Only',0
 '2107',200,60500,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',200,54000,0,'McMillan',0,6400,0,'McMillan',0,3100,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,2400,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2800,0,'McMillan',0,6400,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5700,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6300,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
 '2144',200,62200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2357',200,62200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
-'2358',200,54000,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
-'2360',200,111600,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2361',200,111600,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
-'2363',200,60500,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
 '2142',2201,83100,,'',0,62800,,'',0
-'2358',2201,150500,,'',0
-'2360',2201,85200,,'',0
-'2361',2201,82200,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120050 b/src/main/res-current/raw/current_gtfs_schedule_stop_120050
index 015fda137..6b3f3ae8d 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120050
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120050
@@ -1,14 +1,8 @@
-'1653',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1653',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
 '2107',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
 '2142',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
 '2142',3301,60500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3400,4,'',0,7600,4,'',0,3600,4,'',0,8000,4,'',0,7900,4,'',0,3100,4,'',0,8200,4,'',0,3300,4,'',0,7700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0
 '2144',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
 '2144',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
-'2357',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2357',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
-'2358',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'2358',3301,60500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3400,4,'',0,7600,4,'',0,3600,4,'',0,8000,4,'',0,7900,4,'',0,3100,4,'',0,8200,4,'',0,3300,4,'',0,7700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0
-'2363',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2363',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120055 b/src/main/res-current/raw/current_gtfs_schedule_stop_120055
index 32e3c21b7..785f0e24b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120055
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120055
@@ -1,7 +1,4 @@
-'1653',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
 '2142',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120056 b/src/main/res-current/raw/current_gtfs_schedule_stop_120056
index 8e04cda75..d3d1cc889 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120056
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120056
@@ -1,7 +1,4 @@
-'1653',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'1349',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
 '2107',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2357',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
-'2358',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120057 b/src/main/res-current/raw/current_gtfs_schedule_stop_120057
index 88db283ef..a25099e9b 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120057
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120057
@@ -1,7 +1,4 @@
-'1653',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1349',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
 '2107',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
 '2142',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
 '2144',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2357',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
-'2358',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'2363',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120058 b/src/main/res-current/raw/current_gtfs_schedule_stop_120058
index 442377033..0b62e6bf7 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120058
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120058
@@ -1,7 +1,4 @@
-'1653',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
 '2142',3400,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
 '2144',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2357',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2358',3400,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'2363',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120059 b/src/main/res-current/raw/current_gtfs_schedule_stop_120059
index 85bdf3416..9b6b1ee79 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120059
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120059
@@ -1,7 +1,4 @@
-'1653',3501,93800,,'',0,30300,,'',0,59700,,'',0
+'1349',3501,93800,,'',0,30300,,'',0,59700,,'',0
 '2107',3501,82900,,'',0,67200,,'',0,22000,,'',0
 '2142',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2144',3501,93800,,'',0,30300,,'',0,59700,,'',0
-'2357',3501,93800,,'',0,30300,,'',0,59700,,'',0
-'2358',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2363',3501,82900,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120061 b/src/main/res-current/raw/current_gtfs_schedule_stop_120061
index bba541df2..8307ed1b3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120061
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120061
@@ -1,14 +1,8 @@
-'1653',700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0,29900,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0
-'1653',701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'1349',700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0,29900,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0
+'1349',701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,29900,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
 '2107',700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
 '2107',701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
 '2142',700,74900,4,'',0,6000,4,'',0,13500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,6500,4,'',0,13900,4,'',0,19900,4,'',0,19900,4,'',0
 '2142',701,74900,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
 '2144',700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
 '2144',701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2357',700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
-'2357',701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
-'2358',700,74900,4,'',0,6000,4,'',0,13500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,6500,4,'',0,13900,4,'',0,19900,4,'',0,19900,4,'',0
-'2358',701,74900,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'2363',700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
-'2363',701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120062 b/src/main/res-current/raw/current_gtfs_schedule_stop_120062
index 5408dd5d9..99b590244 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120062
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120062
@@ -1,7 +1,4 @@
-'1653',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
+'1349',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
 '2107',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
 '2142',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
 '2144',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
-'2357',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
-'2358',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'2363',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120063 b/src/main/res-current/raw/current_gtfs_schedule_stop_120063
index 8719b2ec6..256666af4 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120063
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120063
@@ -1,61 +1,35 @@
-'1653',3100,201200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3100,201200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3100,91200,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0
 '2142',3100,95700,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0
-'2358',3100,95700,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0
-'2363',3100,91200,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0
-'1653',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0,10300,4,'',0
+'1349',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0,10300,4,'',0
 '2107',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0
 '2142',3200,95900,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3700,4,'',0,11400,4,'',0,48500,4,'',0
 '2144',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
-'2357',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
-'2358',3200,95900,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3700,4,'',0,11400,4,'',0,48500,4,'',0
-'2363',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0
-'1653',3300,190900,4,'',0
-'1653',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3300,190900,4,'',0
+'1349',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3300,185600,4,'',0,10300,4,'',0,14500,4,'',0
 '2107',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
 '2142',3300,61900,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,51300,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,10600,4,'',0,9900,4,'',0
 '2142',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',3300,190900,4,'',0
 '2144',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2357',3300,190900,4,'',0
-'2357',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'2358',3300,61900,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,51300,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,10600,4,'',0,9900,4,'',0
-'2358',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',3300,195900,4,'',0,14500,4,'',0
-'2363',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'1653',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1653',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0,16300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
 '2107',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
 '2142',3400,62000,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8500,4,'',0,3000,4,'',0,7600,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,10100,4,'',0
 '2142',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7300,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,10000,,'',0,9700,,'',0
 '2144',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
 '2144',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2357',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
-'2357',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'2358',3400,62000,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8500,4,'',0,3000,4,'',0,7600,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,10100,4,'',0
-'2358',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7300,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,10000,,'',0,9700,,'',0
-'2363',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
-'2363',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'1653',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
-'1653',3501,93200,,'',0,30300,,'',0,59800,,'',0
+'1349',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
+'1349',3501,93200,,'',0,30300,,'',0,59800,,'',0
 '2107',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
 '2107',3501,82400,,'',0,63100,,'',0,26000,,'',0
 '2142',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
 '2142',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
 '2144',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
 '2144',3501,93200,,'',0,30300,,'',0,59800,,'',0
-'2357',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
-'2357',3501,93200,,'',0,30300,,'',0,59800,,'',0
-'2358',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
-'2358',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'2363',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
-'2363',3501,82400,,'',0,63100,,'',0,26000,,'',0
-'1653',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
+'1349',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
 '2107',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
 '2142',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
 '2144',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
-'2357',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
-'2358',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
-'2363',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120064 b/src/main/res-current/raw/current_gtfs_schedule_stop_120064
index 92f006445..9f6666f80 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120064
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120064
@@ -1,37 +1,21 @@
-'1653',3100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0,10200,4,'',0
-'1653',3101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0,10200,4,'',0
+'1349',3101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
 '2107',3101,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
 '2142',3100,61900,4,'',0,3100,4,'',0,5800,4,'',0,1300,4,'',0,1700,4,'',0,1300,4,'',0,5800,4,'',0,1300,4,'',0,1800,4,'',0,1200,4,'',0,7300,4,'',0,51000,4,'',0,7600,4,'',0,1700,4,'',0,2000,4,'',0,900,4,'',0,5000,4,'',0,1800,4,'',0,1700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1300,4,'',0,1800,4,'',0,5700,4,'',0,4200,4,'',0,7600,4,'',0,11400,4,'',0,15400,4,'',0,10900,4,'',0
 '2142',3101,62500,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,2000,,'',0,2500,,'',0,8500,,'',0,16500,,'',0,11000,,'',0
 '2144',3100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
 '2144',3101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'2357',3101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3100,61900,4,'',0,3100,4,'',0,5800,4,'',0,1300,4,'',0,1700,4,'',0,1300,4,'',0,5800,4,'',0,1300,4,'',0,1800,4,'',0,1200,4,'',0,7300,4,'',0,51000,4,'',0,7600,4,'',0,1700,4,'',0,2000,4,'',0,5300,4,'',0,900,4,'',0,1500,4,'',0,1700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1300,4,'',0,1800,4,'',0,5700,4,'',0,4200,4,'',0,7600,4,'',0,11400,4,'',0,15400,4,'',0,10900,4,'',0
-'2358',3101,62500,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,2000,,'',0,2500,,'',0,8500,,'',0,16500,,'',0,11000,,'',0
-'2363',3100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
-'2363',3101,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
-'1653',3200,204200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1653',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',3200,204200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',3200,185200,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
 '2107',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
 '2142',3200,62000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,58800,4,'',0,11600,4,'',0,7400,4,'',0,3900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,11900,4,'',0,10700,4,'',0
 '2142',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,9000,,'',0,11000,,'',0
 '2144',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2357',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'2358',3200,62000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,58800,4,'',0,11600,4,'',0,7400,4,'',0,3900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,11900,4,'',0,10700,4,'',0
-'2358',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,9000,,'',0,11000,,'',0
-'2363',3200,192700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
-'2363',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1653',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0,19900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1349',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0,19900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
 '2107',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
 '2142',3300,95400,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,65200,4,'',0,9600,4,'',0
 '2144',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'2357',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'2358',3300,95400,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,65200,4,'',0,9600,4,'',0
-'2363',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0
 '2107',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0
 '2142',3400,95400,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0,65500,4,'',0
-'2358',3400,95400,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0,65500,4,'',0
-'2363',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120067 b/src/main/res-current/raw/current_gtfs_schedule_stop_120067
index ba87089f2..3b3aa5e44 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120067
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120067
@@ -1,7 +1,4 @@
-'1653',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'1349',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
 '2107',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
 '2142',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
 '2144',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2357',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'2358',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
-'2363',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120068 b/src/main/res-current/raw/current_gtfs_schedule_stop_120068
index 6b87e82d6..bcb059085 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120068
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120068
@@ -1,7 +1,4 @@
-'1653',500,64200,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',500,64200,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0,10500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',500,70300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,7400,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,9600,,'',0
 '2142',500,61500,,'',0,9100,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,8400,,'',0,4500,,'',0,9800,,'',0
 '2144',500,64200,,'',0,10700,,'',0,10100,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,5300,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2357',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'2358',500,61400,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'2363',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120069 b/src/main/res-current/raw/current_gtfs_schedule_stop_120069
index d3e3a1348..736001923 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120069
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120069
@@ -1,7 +1,4 @@
-'1653',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'1349',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
 '2107',501,64000,,'',0,9700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3300,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',501,61000,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7500,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
 '2144',501,62400,,'',0,10000,,'',0,9400,,'',0,9800,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9400,,'',0,9000,,'',0,9100,,'',0,9600,,'',0,9000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'2357',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'2363',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120070 b/src/main/res-current/raw/current_gtfs_schedule_stop_120070
index 9d067de5f..293423221 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120070
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120070
@@ -1,7 +1,4 @@
-'1653',700,61100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,61100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0,7500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,61100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2144',700,61100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2357',700,61100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
-'2358',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2363',700,61100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120071 b/src/main/res-current/raw/current_gtfs_schedule_stop_120071
index 828aea58a..c9f22a1f3 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120071
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120071
@@ -1,14 +1,8 @@
-'1653',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
-'1653',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,13500,4,'',0
+'1349',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0,11000,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,13500,4,'',0
 '2107',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2107',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
 '2142',400,61700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2142',401,61700,4,'',0,9600,4,'',0,2000,4,'',0,7300,4,'',0,11300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,2400,4,'',0,7600,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
 '2144',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
 '2144',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
-'2357',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
-'2358',400,61700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2358',401,61700,4,'',0,9600,4,'',0,2000,4,'',0,7300,4,'',0,11300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,2400,4,'',0,7600,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
-'2363',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2363',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120072 b/src/main/res-current/raw/current_gtfs_schedule_stop_120072
index dfb0c7915..dc54de549 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120072
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120072
@@ -1,57 +1,31 @@
-'1653',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,4,'',0
+'1349',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,4,'',0
 '2107',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
 '2142',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2300,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2357',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'2358',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2363',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'1653',200,64400,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
+'1349',200,64400,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0,9000,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4500,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0
 '2107',200,62600,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
 '2142',200,60200,0,'McMillan',0,2500,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,6100,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6400,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,2400,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,7000,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1700,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1700,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0,2900,0,'McMillan',0
 '2144',200,64400,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2357',200,64400,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
-'2358',200,60100,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
-'2360',200,114300,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2361',200,114300,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
-'2363',200,62600,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
-'1653',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,4,'',0,600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'1349',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,4,'',0,600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
 '2107',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9600,,'',0,9100,4,'',0
 '2142',301,54900,,'',0,9000,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,9900,,'',0,9500,4,'',0
 '2144',301,61800,,'',0,10600,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,4,'',0
-'2357',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
-'2358',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,4,'',0
-'2363',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
-'1653',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
+'1349',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17500,,'',0
 '2107',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,63700,4,'',0,9600,4,'',0,2000,4,'',0,18600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
 '2142',401,60500,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2144',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2357',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,63700,4,'',0,9600,4,'',0,2000,4,'',0,18600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
-'2358',401,60500,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2363',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',700,60600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
+'1349',700,60600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0,3500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0
 '2107',700,60600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
 '2142',700,61900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
 '2142',701,65200,4,'',0,17800,4,'',0,7400,4,'',0,10100,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,9900,4,'',0,10700,4,'',0,9800,4,'',0,10500,4,'',0,9800,4,'',0,10100,4,'',0,9800,4,'',0,10000,4,'',0
 '2144',700,60600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2357',700,60600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
-'2358',700,61900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
-'2358',701,65200,4,'',0,17800,4,'',0,7400,4,'',0,10100,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,9900,4,'',0,10700,4,'',0,9800,4,'',0,10500,4,'',0,9800,4,'',0,10100,4,'',0,9800,4,'',0,10000,4,'',0
-'2363',700,60600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
-'1653',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
+'1349',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,15000,,'',0,13100,,'',0,16900,,'',0,13000,,'',0,17300,,'',0
 '2107',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2142',901,61700,4,'',0,10100,4,'',0,10400,4,'',0,9800,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
 '2144',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2358',901,61700,4,'',0,10100,4,'',0,10400,4,'',0,9800,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'2363',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
 '2142',1500,73600,4,'',0,12000,4,'',0,68400,4,'',0
-'2358',1500,73700,4,'',0,12000,4,'',0,68300,4,'',0
 '2142',1600,73600,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
-'2358',1600,73700,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
 '2142',2600,142100,0,'Sandy Hl',0
 '2142',2601,73600,0,'Sandy Hl',0
-'2358',2601,73600,0,'Sandy Hl',0,68500,0,'Sandy Hl',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120073 b/src/main/res-current/raw/current_gtfs_schedule_stop_120073
index 28b84c45c..7c6dd53d2 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120073
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120073
@@ -1,57 +1,31 @@
-'1653',100,62800,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
+'1349',100,62800,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0,3300,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,8500,0,'UFV',0,4500,0,'UFV',0,8500,0,'UFV',0
 '2107',100,63100,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
 '2142',100,54800,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,5200,0,'UFV',0,1000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2300,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1700,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6400,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
 '2144',100,62800,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2357',100,62800,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
-'2358',100,54800,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
-'2363',100,63100,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
-'1653',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
+'1349',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0
 '2107',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
 '2142',201,52600,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,5800,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,5900,,'',0,1900,,'',0,1400,0,'Bourquin Exch Only',0,600,,'',0,6200,,'',0,1700,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2300,,'',0,7100,,'',0,7100,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
 '2144',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2357',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'2358',201,52200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2360',201,103200,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2361',201,103200,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
-'2363',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'1653',300,65000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1349',300,65000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
 '2107',300,60600,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9700,,'',0,9400,,'',0
 '2142',300,60300,,'',0,3300,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4500,,'',0,10000,,'',0,9500,,'',0
 '2144',300,65000,,'',0,10000,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5100,,'',0,9600,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2357',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2358',300,60300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'2363',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1653',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,82400,4,'',0,68000,4,'',0
 '2144',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2357',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'2358',400,82400,4,'',0,68000,4,'',0
-'2363',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1653',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,4,'',0
+'1349',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0,7700,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,,'',0,10200,,'',0,9800,4,'',0
 '2107',701,63500,,'',0,9900,,'',0,9900,,'',0,9800,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
 '2142',701,65000,0,'Montrose Exch',0,15700,4,'',0,2100,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2300,4,'',0,7500,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10500,4,'',0
 '2144',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2357',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
-'2358',701,65000,0,'Montrose Exch',0,15700,4,'',0,2100,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2300,4,'',0,7500,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10500,4,'',0
-'2363',701,63500,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
-'1653',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,4,'',0
+'1349',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13300,4,'',0
 '2107',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2142',901,222200,4,'',0
 '2144',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2357',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
-'2358',901,222200,4,'',0
-'2363',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
 '2107',1500,93500,4,'',0,20100,4,'',0,40000,4,'',0,19900,4,'',0
 '2107',1501,85700,,'',0,20000,,'',0,40000,,'',0,20000,,'',0
 '2142',1500,65100,4,'',0,109000,4,'',0,8900,4,'',0
 '2142',1501,61400,,'',0,4300,,'',0,15800,,'',0,64300,,'',0,24200,,'',0,5100,,'',0
-'2358',1500,65200,4,'',0,108900,4,'',0,9000,4,'',0
-'2358',1501,61400,,'',0,4300,,'',0,15800,,'',0,64300,,'',0,24200,,'',0,5100,,'',0
-'2363',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
-'2363',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
 '2142',1601,80600,4,'',0,12000,4,'',0,68600,4,'',0,4600,4,'',0
-'2358',1601,80800,4,'',0,11900,4,'',0,68500,4,'',0,4600,4,'',0
 '2142',2600,151100,4,'',0
 '2142',2601,82300,,'',0
-'2358',2600,82300,,'',0,68800,4,'',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120074 b/src/main/res-current/raw/current_gtfs_schedule_stop_120074
index f5fbabd3b..dfbf58679 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120074
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120074
@@ -1,10 +1,6 @@
-'1653',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
+'1349',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0,11000,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13500,,'',0
 '2107',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
 '2142',400,62000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
 '2144',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2357',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
-'2358',400,62000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'2363',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2142',2600,144300,0,'Montrose Exch Only',0
+'2142',2600,144300,,'',0
 '2142',2601,80700,,'',0
-'2358',2600,80700,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120075 b/src/main/res-current/raw/current_gtfs_schedule_stop_120075
index ad3837dbd..5bfa658b0 100644
--- a/src/main/res-current/raw/current_gtfs_schedule_stop_120075
+++ b/src/main/res-current/raw/current_gtfs_schedule_stop_120075
@@ -1,7 +1,4 @@
-'1653',301,61500,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
+'1349',301,61500,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Montrose Exch Only',0
 '2107',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,9600,,'',0,9200,0,'Montrose Exch Only',0
 '2142',301,54600,,'',0,8900,,'',0,7300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,7400,,'',0,7500,,'',0,3200,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
 '2144',301,61500,,'',0,10500,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9500,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,0,'Montrose Exch Only',0
-'2357',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
-'2358',301,54600,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'2363',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',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 96dc3e74a..cb3da041a 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.1583</string>
     <string name="current_gtfs_rts_area_min_lng">-122.47064</string>
     <string name="current_gtfs_rts_area_max_lng">-122.21454</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1703426400</integer><!-- 2023/12/24 06:00:00 PST -->
-    <integer name="current_gtfs_rts_last_departure_in_sec">1712470380</integer><!-- 2024/04/06 23:13:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1704031200</integer><!-- 2023/12/31 06:00:00 PST -->
+    <integer name="current_gtfs_rts_last_departure_in_sec">1704611580</integer><!-- 2024/01/06 23:13:00 PST -->
 </resources>
diff --git a/src/main/res-next/raw/next_gtfs_rts_routes b/src/main/res-next/raw/next_gtfs_rts_routes
new file mode 100644
index 000000000..d1a16accd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_rts_routes
@@ -0,0 +1,22 @@
+1,'1','Highstreet / UFV','8CC63F',46659767,3
+2,'2','Highstreet / McMillan','8177B7',47583288,3
+3,'3','Clearbrook / Huntingdon','F37421',48506809,3
+4,'4','Saddle / Montrose','AC5C3B',49430330,3
+5,'5','Clearbrook / Bourquin Via Hosp','A54499',50353851,3
+6,'6','Gladwin','00AEEF',51277372,3
+7,'7','Sumas Mtn / Montrose','00AA4F',52200893,3
+9,'9','McKee / Montrose','5D87A1',54047935,3
+12,'12','UFV / Bourquin','004B8D',1450411687,3
+15,'15','Auguston / Montrose','49176D',1453182250,3
+16,'16','McMillan / Montrose','B3AA7E',1454105771,3
+17,'17','Ind / Bourquin','75AE99',1455029292,3
+21,'21','Aldergrove / Abbotsford','7C3F25',1478117317,3
+22,'22','East Townline S Special','FCAF17',1479040838,3
+24,'24','Ctr Loop S Special','ED1D8F',1480887880,3
+26,'26','Sandy Hl / Bourquin School Special','E270AB',1482734922,3
+31,'31','Abbotsford / Mission','BF83B9',1506746468,3
+32,'32','West Hts','ED1D8F',1507669989,3
+33,'33','Cedar Vly','00AA4F',1508593510,3
+34,'34','East Side','FCAF17',1509517031,3
+35,'35','Hatzic','F37421',1510440552,3
+39,'39','Shopper Shuttle','004B8D',1514134636,3
diff --git a/src/main/res-next/raw/next_gtfs_rts_stops b/src/main/res-next/raw/next_gtfs_rts_stops
new file mode 100644
index 000000000..98cecc41d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_rts_stops
@@ -0,0 +1,619 @@
+105721,'105721','Blueridge & Townline',49.06762,-122.36092,0,1448790784
+105722,'105722','Blueridge & Townline',49.06774,-122.36094,0,1448790785
+105723,'105723','Downes & Clearbrook',49.07456,-122.34718,0,1448790786
+105724,'105724','Clearbrook & Sorrento',49.06685,-122.33815,0,1448790787
+105725,'105725','Maclure & Trethewey',49.06019,-122.32771,0,1448790788
+105726,'105726','Exbury & Laburnum',49.06825,-122.25506,0,1448790789
+105727,'105727','34970 Old Clayburn Rd',49.06127,-122.25651,0,1448790790
+105729,'105729','Gladwin & Old Riverside',49.06561,-122.31603,0,1448790792
+105730,'105730','Townline & Downes',49.07418,-122.36001,0,1448790814
+105731,'105731','Townline & Blueridge',49.06716,-122.35989,0,1448790815
+105732,'105732','Bevan & Cascade',49.04178,-122.32338,0,1448790816
+105733,'105733','Trethewey & Simon',49.05289,-122.32672,0,1448790817
+105734,'105734','Trethewey & G Ferguson',49.05458,-122.3268,0,1448790818
+105735,'105735','Trethewey & Veterans',49.05273,-122.32678,0,1448790819
+105736,'105736','Townline & Southern',49.05646,-122.36006,0,1448790820
+105737,'105737','Trethewey & Maclure',49.06098,-122.32695,0,1448790821
+105738,'105738','Trethewey & Diamond',49.05695,-122.32681,0,1448790822
+105739,'105739','Gladwin & Highland',49.06743,-122.31601,0,1448790823
+107001,'107001','Townline & Up Maclure',49.06067,-122.35995,0,1448843577
+107005,'107005','Blueridge & Ridgeview',49.0674,-122.34799,0,1448843581
+107006,'107006','Blueridge & Clearbrook',49.06454,-122.33882,0,1448843582
+107007,'107007','Clearbrook & Austin',49.06189,-122.33805,0,1448843583
+107008,'107008','Clearbrook & Maclure',49.05961,-122.338,0,1448843584
+107009,'107009','Clearbrook & Coral',49.05741,-122.338,0,1448843585
+107010,'107010','Clearbrook & G Ferguson',49.05569,-122.33803,0,1448843607
+107011,'107011','Clearbrook & Tims',49.0535,-122.33801,0,1448843608
+107012,'107012','S Fraser & Clearbrook',49.04975,-122.33679,0,1448843609
+107013,'107013','S Fraser & Minter',49.05119,-122.33301,0,1448843610
+107014,'107014','S Fraser & Adelaide',49.05151,-122.32892,0,1448843611
+107015,'107015','S Fraser & Trethewey',49.05136,-122.32482,0,1448843612
+107016,'107016','S Fraser & Allwood',49.05119,-122.32058,0,1448843613
+107017,'107017','S Fraser & Emerson',49.05105,-122.31748,0,1448843614
+107018,'107018','S Fraser & Gladwin',49.0509,-122.3134,0,1448843615
+107019,'107019','S Fraser & Bourquin W',49.05083,-122.31143,0,1448843616
+107020,'107020','Bourquin Exch',49.04834,-122.30861,0,1448843638
+107021,'107021','Bourquin W & Mill Lk',49.04742,-122.30746,0,1448843639
+107022,'107022','Bourquin W & Ware',49.04686,-122.30574,0,1448843640
+107023,'107023','Ware & Plaxton',49.04562,-122.30455,0,1448843641
+107024,'107024','Ware & Farrant',49.04402,-122.30456,0,1448843642
+107025,'107025','Bevan & Ware',49.04191,-122.30361,0,1448843643
+107026,'107026','33386 Bevan Av',49.04193,-122.29791,0,1448843644
+107027,'107027','Bevan & Cannon',49.04441,-122.29627,0,1448843645
+107030,'107030','Essendene & Montrose',49.04894,-122.28991,0,1448843669
+107031,'107031','Essendene & Gladys',49.04893,-122.28721,0,1448843670
+107032,'107032','Old Yale & Willow',49.04784,-122.28373,0,1448843671
+107033,'107033','Old Yale & Pk',49.04677,-122.28019,0,1448843672
+107034,'107034','Old Yale & Hyatt',49.04635,-122.27524,0,1448843673
+107035,'107035','Old Yale & McAdam',49.04846,-122.26559,0,1448843674
+107036,'107036','Old Yale & McMillan',49.04873,-122.26182,0,1448843675
+107037,'107037','McMillan & Old Yale',49.04898,-122.26022,0,1448843676
+107038,'107038','McMillan & Chantrell',49.05186,-122.26038,0,1448843677
+107039,'107039','McMillan & McCabe',49.05335,-122.2604,0,1448843678
+107040,'107040','McKee & McBride',49.05563,-122.25713,0,1448843700
+107041,'107041','McKee & Glenshiel',49.05595,-122.25501,0,1448843701
+107042,'107042','McKee & Glencoe',49.05657,-122.25319,0,1448843702
+107043,'107043','McKee & Cassiar',49.05828,-122.2511,0,1448843703
+107044,'107044','McKee & High',49.05975,-122.25019,0,1448843704
+107045,'107045','McKee Rd & McKee Dr',49.06221,-122.24829,0,1448843705
+107046,'107046','McKee & Purcell',49.0632,-122.2462,0,1448843706
+107047,'107047','McKee & McKinley',49.06385,-122.24494,0,1448843707
+107048,'107048','McKinley Pl',49.06599,-122.24429,0,1448843708
+107049,'107049','McKinley & Sandy Hl',49.06754,-122.24148,0,1448843709
+107050,'107050','35397 Sandy Hl Rd',49.06795,-122.24464,0,1448843731
+107051,'107051','Sandy Hl & Burnside',49.06991,-122.24798,0,1448843732
+107052,'107052','Sandy Hl Pl',49.07116,-122.24819,0,1448843733
+107053,'107053','Old Clayburn & Sandy Hl',49.07118,-122.24939,0,1448843734
+107054,'107054','Old Clayburn & Skeena',49.06739,-122.24944,0,1448843735
+107055,'107055','Old Clayburn & Monashee',49.06382,-122.25033,0,1448843736
+107056,'107056','Old Clayburn & Mt Blanchard',49.06287,-122.25165,0,1448843737
+107057,'107057','34960 Old Clayburn Rd',49.06127,-122.2567,0,1448843738
+107058,'107058','Vernon & Old Clayburn',49.06135,-122.25869,0,1448843739
+107059,'107059','Mt Blanchard & Vernon',49.06321,-122.25821,0,1448843740
+107060,'107060','Mt Blanchard Crt',49.06401,-122.25382,0,1448843762
+107061,'107061','McKee & Old Clayburn',49.06269,-122.25086,0,1448843763
+107062,'107062','McKee Dr & McKee Rd',49.06183,-122.24934,0,1448843764
+107063,'107063','McKee & Wells Gray',49.06051,-122.24929,0,1448843765
+107064,'107064','McKee & Cassiar',49.05819,-122.25117,0,1448843766
+107065,'107065','McKee & McCrae',49.05668,-122.25307,0,1448843767
+107066,'107066','McKee & Glenalmond',49.05596,-122.25527,0,1448843768
+107067,'107067','McKee & Gleneagles',49.05559,-122.25813,0,1448843769
+107068,'107068','McMillan & Sandon',49.05103,-122.26042,0,1448843770
+107069,'107069','McMillan & Old Yale',49.04919,-122.26034,0,1448843771
+107070,'107070','Old Yale & McAdam',49.0489,-122.26405,0,1448843793
+107071,'107071','Old Yale & Guilford',49.04789,-122.26714,0,1448843794
+107072,'107072','Old Yale & Grosvenor',49.04627,-122.27317,0,1448843795
+107073,'107073','Old Yale & Hyatt',49.04641,-122.27508,0,1448843796
+107074,'107074','Old Yale & Alderview',49.04681,-122.27978,0,1448843797
+107075,'107075','Old Yale & Campbell',49.04708,-122.28224,0,1448843798
+107076,'107076','Old Yale & Willow',49.04821,-122.28406,0,1448843799
+107077,'107077','Essendene & Cyril',49.04902,-122.28682,0,1448843800
+107078,'107078','Essendene & W Railway',49.04903,-122.28868,0,1448843801
+107079,'107079','Montrose & Essendene',49.04875,-122.29045,0,1448843802
+107081,'107081','33497 Bevan Av',49.04395,-122.29639,0,1448843825
+107082,'107082','33386 Bevan Av',49.04189,-122.29875,0,1448843826
+107083,'107083','Ware & Bevan',49.04244,-122.30446,0,1448843827
+107084,'107084','Ware & Ravine',49.04491,-122.30445,0,1448843828
+107085,'107085','Bourquin W & Ware',49.04694,-122.30533,0,1448843829
+107087,'107087','S Fraser & Gladwin (E)',49.05101,-122.3131,0,1448843831
+107088,'107088','S Fraser & Gladwin (W)',49.05117,-122.31689,0,1448843832
+107089,'107089','S Fraser & Emerson',49.05125,-122.31887,0,1448843833
+107090,'107090','S Fraser & Gdn',49.05143,-122.32243,0,1448843855
+107091,'107091','S Fraser & Adelaide',49.05168,-122.32809,0,1448843856
+107092,'107092','32145 Old Yale Rd',49.05189,-122.33324,0,1448843857
+107093,'107093','Old Yale & Clearbrook (E)',49.05199,-122.33584,0,1448843858
+107094,'107094','Clearbrook & G Ferguson',49.05411,-122.33786,0,1448843859
+107095,'107095','Clearbrook & Coral',49.05581,-122.33785,0,1448843860
+107096,'107096','Clearbrook & Charlotte',49.05831,-122.33784,0,1448843861
+107097,'107097','Clearbrook & Austin',49.06184,-122.33792,0,1448843862
+107098,'107098','Blueridge & Saturna',49.06463,-122.33963,0,1448843863
+107099,'107099','Ridgeview & Blueridge',49.06683,-122.34879,0,1448843864
+107100,'107100','Ridgeview & Viewmount',49.06527,-122.35158,0,1448844537
+107101,'107101','Ponderosa & Ridgeview',49.06499,-122.35444,0,1448844538
+107102,'107102','Ponderosa & Spur',49.06273,-122.35443,0,1448844539
+107107,'107107','Mt Lehman & Cardinal',49.06179,-122.38112,0,1448844544
+107108,'107108','Sandpiper & Mt Lehman',49.06271,-122.38004,0,1448844545
+107109,'107109','Goldfinch & Robin',49.06371,-122.37657,0,1448844546
+107110,'107110','Blueridge & Goldfinch',49.06581,-122.37551,0,1448844568
+107111,'107111','Blueridge & Blue Jay',49.06583,-122.37146,0,1448844569
+107112,'107112','Blue Jay & Sandpiper',49.06097,-122.37061,0,1448844570
+107113,'107113','Blue Jay & Osprey W',49.05831,-122.37056,0,1448844571
+107115,'107115','31020 Maclure Rd',49.05459,-122.3647,0,1448844573
+107116,'107116','Maclure & Townline',49.05399,-122.35934,0,1448844574
+107117,'107117','Old Yale & Mitchell',49.05264,-122.35354,0,1448844575
+107118,'107118','Old Yale & Sunnyside',49.05269,-122.34731,0,1448844576
+107119,'107119','Old Yale & Victoria',49.05193,-122.34296,0,1448844577
+107120,'107120','Old Yale & Clearbrook',49.05187,-122.33845,0,1448844599
+107121,'107121','Clearbrook & Sunrise',49.04757,-122.33727,0,1448844600
+107122,'107122','Bourquin W & Ventura',49.05196,-122.31025,0,1448844601
+107123,'107123','Bourquin W & Amicus',49.0534,-122.31028,0,1448844602
+107124,'107124','G Ferguson & Trafalgar',49.05417,-122.30848,0,1448844603
+107125,'107125','G Ferguson & Ware',49.05333,-122.3055,0,1448844604
+107126,'107126','G Ferguson & Fuller',49.05254,-122.30274,0,1448844605
+107127,'107127','G Ferguson & Babich',49.0516,-122.29909,0,1448844606
+107128,'107128','G Ferguson & Mountview',49.05067,-122.29584,0,1448844607
+107129,'107129','G Ferguson & McCallum',49.05006,-122.29261,0,1448844608
+107130,'107130','McCallum & Cannon',49.04497,-122.29351,0,1448844630
+107131,'107131','McCallum & Wildwood',49.04214,-122.29345,0,1448844631
+107132,'107132','McCallum & Mayfair',49.0405,-122.29341,0,1448844632
+107133,'107133','Marshall & McCallum',49.03897,-122.29219,0,1448844633
+107134,'107134','Marshall & Salton',49.03881,-122.28842,0,1448844634
+107135,'107135','Marshall & McKenzie',49.03859,-122.28347,0,1448844635
+107136,'107136','Marshall & Dahl',49.03841,-122.27875,0,1448844636
+107137,'107137','Marshall & Abbotsford',49.03831,-122.27637,0,1448844637
+107138,'107138','1812 Vedder Way',49.03519,-122.27149,0,1448844638
+107139,'107139','Lonzo & Sumas',49.03481,-122.26811,0,1448844639
+107140,'107140','Sumas Shopping Ctr',49.02712,-122.26671,0,1448844661
+107142,'107142','Sumas & Vye',49.01531,-122.26537,0,1448844663
+107143,'107143','B St & 6 Av',49.00754,-122.26303,0,1448844664
+107146,'107146','1250 Sumas Way',49.02573,-122.26542,0,1448844667
+107147,'107147','Lonzo & Sumas',49.03473,-122.26854,0,1448844668
+107148,'107148','1812 Vedder Way',49.03579,-122.2716,0,1448844669
+107149,'107149','Marshall & Riverside',49.03832,-122.27484,0,1448844670
+107150,'107150','Marshall & Eldorado',49.03849,-122.2789,0,1448844692
+107151,'107151','Marshall & McKenzie',49.03864,-122.28278,0,1448844693
+107153,'107153','Marshall & McCallum',49.03903,-122.2917,0,1448844695
+107154,'107154','McCallum & Mayfair',49.04036,-122.29328,0,1448844696
+107155,'107155','McCallum & Wildwood',49.04171,-122.29331,0,1448844697
+107156,'107156','McCallum & Busby',49.04353,-122.29335,0,1448844698
+107157,'107157','McCallum & McDougall',49.04503,-122.29338,0,1448844699
+107158,'107158','Montrose & Essendene',49.04919,-122.29028,0,1448844700
+107159,'107159','G Ferguson & McCallum',49.05013,-122.29275,0,1448844701
+107160,'107160','G Ferguson & Mountview',49.05051,-122.29502,0,1448844723
+107161,'107161','G Ferguson & Babich',49.05162,-122.29884,0,1448844724
+107162,'107162','G Ferguson & Fuller',49.05223,-122.301,0,1448844725
+107163,'107163','G Ferguson & Ware',49.05328,-122.30502,0,1448844726
+107164,'107164','G Ferguson & Trafalgar',49.05428,-122.30861,0,1448844727
+107165,'107165','Bourquin W & Amicus',49.05317,-122.31041,0,1448844728
+107166,'107166','Bourquin W & Ventura',49.05188,-122.31029,0,1448844729
+107167,'107167','Old Yale & Clearbrook (W)',49.052,-122.33872,0,1448844730
+107168,'107168','Old Yale & Centennial',49.05207,-122.34195,0,1448844731
+107169,'107169','Old Yale & Princess',49.0521,-122.34397,0,1448844732
+107170,'107170','Old Yale & Sunnyside',49.05282,-122.34803,0,1448844754
+107171,'107171','Old Yale & Maclure',49.05304,-122.35423,0,1448844755
+107172,'107172','Maclure & Townline',49.05438,-122.36074,0,1448844756
+107175,'107175','S Fraser & Stanley',49.04678,-122.34498,0,1448844759
+107176,'107176','S Fraser & Ctr',49.04778,-122.3423,0,1448844760
+107177,'107177','S Fraser & Countess',49.04888,-122.33925,0,1448844761
+107178,'107178','G Ferguson & Clearbrook',49.05482,-122.33664,0,1448844762
+107179,'107179','G Ferguson & Tims',49.05489,-122.3333,0,1448844763
+107180,'107180','G Ferguson & Boulder',49.05498,-122.32892,0,1448844785
+107181,'107181','G Ferguson & Prospect',49.05493,-122.32499,0,1448844786
+107182,'107182','G Ferguson & Gdn',49.05497,-122.32008,0,1448844787
+107183,'107183','G Ferguson & Gladwin (W)',49.0553,-122.31586,0,1448844788
+107184,'107184','G Ferguson & Gladwin (E)',49.05518,-122.31372,0,1448844789
+107185,'107185','McCallum & Rainbow',49.03734,-122.29336,0,1448844790
+107186,'107186','McCallum P&R',49.03267,-122.29313,0,1448844791
+107187,'107187','King & McCallum',49.03119,-122.29239,0,1448844792
+107188,'107188','King & College',49.03128,-122.28828,0,1448844793
+107189,'107189','King Cr',49.03139,-122.28351,0,1448844794
+107190,'107190','UFV - Abbotsford',49.02881,-122.28292,0,1448844816
+107191,'107191','Ware & Robertson',49.04887,-122.30454,0,1448844817
+107192,'107192','S Fraser & Ware',49.0503,-122.30383,0,1448844818
+107193,'107193','S Fraser & Bourquin E',49.04992,-122.30043,0,1448844819
+107194,'107194','S Fraser & Roberts',49.04934,-122.29563,0,1448844820
+107195,'107195','King & McKenzie',49.03147,-122.28331,0,1448844821
+107196,'107196','King & College',49.03137,-122.28833,0,1448844822
+107197,'107197','King & McCallum',49.0313,-122.29138,0,1448844823
+107198,'107198','McCallum & Rainbow',49.03673,-122.29317,0,1448844824
+107199,'107199','Ware & Robertson',49.04818,-122.30439,0,1448844825
+107200,'107200','Essendene & Pauline',49.0491,-122.29206,0,1448845498
+107201,'107201','S Fraser & Roberts',49.04947,-122.29578,0,1448845499
+107202,'107202','S Fraser & Bourquin E',49.04981,-122.29886,0,1448845500
+107203,'107203','S Fraser & Alliance',49.05022,-122.3024,0,1448845501
+107204,'107204','G Ferguson & Nelson',49.05478,-122.31186,0,1448845502
+107205,'107205','G Ferguson & Gladwin',49.05539,-122.31625,0,1448845503
+107206,'107206','32659 G Ferguson Way',49.05534,-122.31913,0,1448845504
+107207,'107207','G Ferguson & Oriole',49.05486,-122.3221,0,1448845505
+107208,'107208','G Ferguson & Trethewey',49.05509,-122.32732,0,1448845506
+107209,'107209','G Ferguson & Boulder',49.05503,-122.33021,0,1448845507
+107210,'107210','32121 G Ferguson Way',49.05493,-122.33502,0,1448845529
+107211,'107211','Clearbrook & Old Yale',49.05147,-122.3376,0,1448845530
+107213,'107213','Peardonville & Arbutus',49.04585,-122.33948,0,1448845532
+107214,'107214','Peardonville & Grant',49.0459,-122.34334,0,1448845533
+107215,'107215','G Ferguson & Montrose',49.05011,-122.28974,0,1448845534
+107216,'107216','G Ferguson & Cyril',49.05009,-122.28612,0,1448845535
+107217,'107217','G Ferguson & Campbell',49.05009,-122.28219,0,1448845536
+107218,'107218','G Ferguson & Hemlock',49.05007,-122.27929,0,1448845537
+107219,'107219','Ash & G Ferguson',49.05048,-122.27764,0,1448845538
+107220,'107220','Ash & Redwood',49.05308,-122.27726,0,1448845560
+107221,'107221','2924 Old Clayburn Rd',49.05492,-122.27475,0,1448845561
+107222,'107222','Immel & Old Clayburn',49.05726,-122.27179,0,1448845562
+107223,'107223','Immel & Maclure',49.05913,-122.27188,0,1448845563
+107224,'107224','Laburnum & Maclure',49.06072,-122.27323,0,1448845564
+107225,'107225','34470 Laburnum Av',49.06232,-122.27018,0,1448845565
+107226,'107226','Laburnum & Mierau',49.06337,-122.26679,0,1448845566
+107227,'107227','Laburnum & Sussex',49.06395,-122.26341,0,1448845567
+107228,'107228','34904 Laburnum Av',49.06448,-122.25758,0,1448845568
+107229,'107229','Latimer & Seneca',49.06663,-122.25712,0,1448845569
+107230,'107230','Latimer & Exbury',49.06849,-122.25722,0,1448845591
+107231,'107231','Latimer & Millar',49.06965,-122.25935,0,1448845592
+107232,'107232','Prior & Latimer',49.07077,-122.26136,0,1448845593
+107234,'107234','Latimer & Cooper',49.07219,-122.26097,0,1448845595
+107235,'107235','Latimer & Prior',49.07029,-122.26015,0,1448845596
+107236,'107236','Latimer & Millar',49.0686,-122.25734,0,1448845597
+107237,'107237','Mierau & Ascott',49.06436,-122.26618,0,1448845598
+107238,'107238','Davie St & Davie Crt',49.06664,-122.26564,0,1448845599
+107239,'107239','Davie & De Cosmos',49.06849,-122.26543,0,1448845600
+107240,'107240','Prior & Davie',49.0707,-122.26438,0,1448845622
+107241,'107241','Davie St & Davie Crt',49.06645,-122.26571,0,1448845623
+107242,'107242','Mierau & Donlyn',49.06511,-122.26626,0,1448845624
+107243,'107243','Laburnum & Mierau',49.06345,-122.26665,0,1448845625
+107244,'107244','Laburnum & Epson',49.06313,-122.2684,0,1448845626
+107245,'107245','34417 Laburnum Av',49.06227,-122.27099,0,1448845627
+107246,'107246','Laburnum & Maclure',49.06058,-122.27342,0,1448845628
+107247,'107247','Immel & Maclure',49.05952,-122.27221,0,1448845629
+107248,'107248','Immel & Old Clayburn',49.05714,-122.2719,0,1448845630
+107249,'107249','Ash & Walnut',49.05293,-122.27737,0,1448845631
+107250,'107250','Ash & G Ferguson',49.05045,-122.27776,0,1448845653
+107251,'107251','G Ferguson & Pk',49.05016,-122.28094,0,1448845654
+107252,'107252','G Ferguson & Cyril',49.05017,-122.28554,0,1448845655
+107253,'107253','G Ferguson & Gladys',49.05019,-122.28726,0,1448845656
+107254,'107254','G Ferguson & W Railway',49.0502,-122.28963,0,1448845657
+107255,'107255','Gladys & Morey',49.05377,-122.28698,0,1448845658
+107256,'107256','Hwy 11 & McCallum',49.06536,-122.28641,0,1448845659
+107257,'107257','Cannon & McCallum',49.04566,-122.294,0,1448845660
+107258,'107258','Ware & Vinewood',49.04123,-122.30457,0,1448845661
+107259,'107259','Ware & Brundige',49.03983,-122.30458,0,1448845662
+107260,'107260','Marshall & Ware',49.03832,-122.3052,0,1448845684
+107261,'107261','Marshall & Maplewood',49.03826,-122.30889,0,1448845685
+107262,'107262','Abbotsford Hosp',49.0382,-122.31208,0,1448845686
+107263,'107263','Marshall & Gladwin',49.03818,-122.31661,0,1448845687
+107264,'107264','Marshall & Emerson',49.03821,-122.31896,0,1448845688
+107265,'107265','Marshall & Broadway',49.03823,-122.32326,0,1448845689
+107267,'107267','Marshall & Beaver',49.03827,-122.32984,0,1448845691
+107268,'107268','Marshall & Mdws',49.03829,-122.33336,0,1448845692
+107270,'107270','Clearbrook & Madiera',49.04087,-122.33709,0,1448845715
+107271,'107271','Clearbrook & Melmar',49.04267,-122.337,0,1448845716
+107272,'107272','Clearbrook & Oak',49.04396,-122.33701,0,1448845717
+107273,'107273','S Fraser & Clearbrook',49.049,-122.33944,0,1448845718
+107274,'107274','S Fraser & Ctr',49.04771,-122.34275,0,1448845719
+107275,'107275','S Fraser & Hl-Tout',49.04639,-122.34671,0,1448845720
+107276,'107276','S Fraser & Peardonville',49.04593,-122.34927,0,1448845721
+107277,'107277','Peardonville & Grant',49.04584,-122.34466,0,1448845722
+107278,'107278','Peardonville & Holly',49.04575,-122.33856,0,1448845723
+107279,'107279','Clearbrook & Oak',49.04377,-122.33709,0,1448845724
+107280,'107280','Clearbrook & Sherwood',49.04168,-122.33726,0,1448845746
+107282,'107282','Marshall & Beaver',49.03821,-122.32842,0,1448845748
+107283,'107283','Marshall & Emerson',49.03817,-122.32016,0,1448845749
+107284,'107284','Marshall & Gladwin',49.03812,-122.31625,0,1448845750
+107285,'107285','Abbotsford Hosp',49.03818,-122.31055,0,1448845751
+107286,'107286','Ware & Marshall',49.03884,-122.30451,0,1448845752
+107287,'107287','Ware & Brundige',49.04036,-122.3045,0,1448845753
+107288,'107288','Babich & G Ferguson',49.05238,-122.30009,0,1448845754
+107289,'107289','Babich & Century',49.05446,-122.30021,0,1448845755
+107290,'107290','Babich & Terry Fox',49.05669,-122.30022,0,1448845777
+107291,'107291','33360 Wren Cres',49.05888,-122.29886,0,1448845778
+107292,'107292','Babich & Maclure',49.05991,-122.30143,0,1448845779
+107293,'107293','Maclure & Babich',49.06043,-122.30257,0,1448845780
+107294,'107294','Maclure & Horn',49.06114,-122.30842,0,1448845781
+107295,'107295','Maclure & Gladwin',49.06039,-122.31343,0,1448845782
+107296,'107296','Gladwin & Chehalis',49.06213,-122.31601,0,1448845783
+107297,'107297','Gladwin & Okanagan',49.06446,-122.31597,0,1448845784
+107298,'107298','Gladwin & Old Riverside',49.0665,-122.31594,0,1448845785
+107299,'107299','Harwood & Perth',49.0693,-122.31478,0,1448845786
+107300,'107300','Harwood & Aspen',49.07052,-122.31211,0,1448846459
+107301,'107301','Gatefield & Gladwin',49.0724,-122.31521,0,1448846460
+107302,'107302','Chilcotin & Gladwin',49.0724,-122.31674,0,1448846461
+107303,'107303','Chilcotin & Nicola',49.07066,-122.31956,0,1448846462
+107304,'107304','Qualicum Pl',49.06843,-122.32298,0,1448846463
+107305,'107305','Haida & Qualicum',49.06736,-122.32443,0,1448846464
+107306,'107306','Trethewey & Golden',49.06487,-122.32769,0,1448846465
+107307,'107307','Trethewey & Slocan',49.06194,-122.32704,0,1448846466
+107308,'107308','Trethewey & Maclure',49.05941,-122.32698,0,1448846467
+107309,'107309','Trethewey & Diamond',49.05679,-122.32688,0,1448846468
+107310,'107310','Peardonville & Clearbrook',49.0457,-122.33541,0,1448846490
+107311,'107311','Peardonville & Parkview',49.04563,-122.33289,0,1448846491
+107312,'107312','Peardonville & Adelaide',49.04552,-122.32854,0,1448846492
+107313,'107313','Peardonville & Bevan',49.04546,-122.3247,0,1448846493
+107314,'107314','Peardonville & B''way',49.04544,-122.32098,0,1448846494
+107315,'107315','Peardonville & Emerson',49.04544,-122.31742,0,1448846495
+107316,'107316','2510 Gladwin Rd',49.04768,-122.31533,0,1448846496
+107317,'107317','Gladwin & Hillcrest',49.0497,-122.31509,0,1448846497
+107318,'107318','McKenzie & Lobban',49.04523,-122.28744,0,1448846498
+107319,'107319','McKenzie & Victory',49.04107,-122.28243,0,1448846499
+107320,'107320','McKenzie & Marshall',49.03919,-122.28235,0,1448846521
+107321,'107321','Marshall & Vedder',49.03803,-122.27126,0,1448846522
+107322,'107322','Marshall & Sumas',49.03816,-122.2677,0,1448846523
+107324,'107324','Marshall & Walker',49.03831,-122.26226,0,1448846525
+107325,'107325','Marshall & Sierra',49.03837,-122.25829,0,1448846526
+107326,'107326','Marshall & Everett',49.03843,-122.25353,0,1448846527
+107327,'107327','Marshall & Sandstone',49.03847,-122.25012,0,1448846528
+107328,'107328','Marshall & Munroe',49.04072,-122.24848,0,1448846529
+107329,'107329','Marshall & Old Yale',49.04219,-122.24712,0,1448846530
+107330,'107330','Old Yale & Marshall',49.04207,-122.24594,0,1448846552
+107331,'107331','Old Yale & Delair',49.03903,-122.23967,0,1448846553
+107332,'107332','Old Yale & N Parallel',49.03872,-122.23168,0,1448846554
+107333,'107333','Old Yale & Winfield W',49.03906,-122.23067,0,1448846555
+107334,'107334','Old Yale & Winfield E',49.04082,-122.22766,0,1448846556
+107335,'107335','Old Yale & Waterleaf',49.0419,-122.22522,0,1448846557
+107336,'107336','Whatcom & Mtn',49.04533,-122.22358,0,1448846558
+107337,'107337','Lo Sumas Mtn & Marshall',49.04901,-122.2235,0,1448846559
+107338,'107338','Marshall & Whatcom',49.04957,-122.2284,0,1448846560
+107339,'107339','Marshall & Mtn',49.04821,-122.23065,0,1448846561
+107340,'107340','Mtn & Sundew',49.04632,-122.23011,0,1448846583
+107341,'107341','Mtn & Eaglecrest',49.04482,-122.23014,0,1448846584
+107342,'107342','Mtn & Heatherstone',49.04353,-122.23302,0,1448846585
+107343,'107343','Boley & Mtn',49.04234,-122.23218,0,1448846586
+107344,'107344','Canterbury & Boley',49.04108,-122.23236,0,1448846587
+107345,'107345','Timberlane & Lion',49.04025,-122.23443,0,1448846588
+107346,'107346','35683 Timberlane Dr',49.04073,-122.23782,0,1448846589
+107347,'107347','Marshall & Old Yale',49.04271,-122.24563,0,1448846590
+107348,'107348','Old Yale & Marshall',49.04292,-122.24676,0,1448846591
+107349,'107349','Old Yale & St Moritz',49.04762,-122.25453,0,1448846592
+107350,'107350','McMillan & Old Yale',49.04821,-122.26034,0,1448846614
+107351,'107351','McMillan & Anora',49.04275,-122.26045,0,1448846615
+107352,'107352','McMillan & Mila',49.04047,-122.26061,0,1448846616
+107353,'107353','Marshall & McMillan',49.03837,-122.26117,0,1448846617
+107354,'107354','Marshall & Griffiths',49.03832,-122.26397,0,1448846618
+107355,'107355','Marshall & Eleanor',49.03827,-122.26634,0,1448846619
+107356,'107356','Marshall & Sumas',49.03829,-122.26819,0,1448846620
+107357,'107357','Marshall & Vedder',49.03822,-122.27179,0,1448846621
+107358,'107358','Marshall & Vinewood',49.03838,-122.30299,0,1448846622
+107359,'107359','Marshall & Horizon',49.03855,-122.30071,0,1448846623
+107360,'107360','Horizon & Rainbow',49.03711,-122.29993,0,1448846645
+107361,'107361','Lynn & Horizon',49.03607,-122.29817,0,1448846646
+107363,'107363','Lynn & Westbury',49.03616,-122.29384,0,1448846648
+107364,'107364','King & Kipling',49.0312,-122.29642,0,1448846649
+107365,'107365','King & Kempley',49.03111,-122.301,0,1448846650
+107366,'107366','King & Jackson',49.03099,-122.30681,0,1448846651
+107367,'107367','Jackson & Hawthorne',49.03318,-122.30719,0,1448846652
+107368,'107368','Hawthorne & Highview',49.03331,-122.30215,0,1448846653
+107369,'107369','King & Kempley',49.03106,-122.30101,0,1448846654
+107370,'107370','King & Kirklyn',49.03117,-122.29577,0,1448846676
+107371,'107371','Marshall & McCallum',49.03898,-122.29524,0,1448846677
+107372,'107372','33433 Marshall Rd',49.03883,-122.29729,0,1448846678
+107373,'107373','Marshall & Horizon',49.03862,-122.30039,0,1448846679
+107374,'107374','Old Clayburn & York',49.05726,-122.27065,0,1448846680
+107375,'107375','Old Clayburn & Saddle',49.05944,-122.26783,0,1448846681
+107377,'107377','McKee & McKinley',49.06474,-122.24415,0,1448846683
+107378,'107378','McKee & Whatcom',49.06604,-122.24116,0,1448846684
+107379,'107379','McKee & Ledgeview',49.06954,-122.23699,0,1448846685
+107380,'107380','McKee & Buckingham',49.07303,-122.22162,0,1448846707
+107381,'107381','Blauson & L Pearson',49.08189,-122.21454,0,1448846708
+107382,'107382','Auguston & Blauson',49.08284,-122.21751,0,1448846709
+107383,'107383','Auguston & B Reid',49.08095,-122.22164,0,1448846710
+107384,'107384','Auguston & S Leacock',49.07992,-122.22353,0,1448846711
+107385,'107385','Auguston ES',49.08362,-122.21842,0,1448846712
+107386,'107386','Blauson & L Pearson',49.08202,-122.21487,0,1448846713
+107387,'107387','McKee & Buckingham',49.073,-122.22189,0,1448846714
+107388,'107388','36060 McKee Rd',49.07118,-122.22552,0,1448846715
+107389,'107389','McKee & Ledgeview',49.06953,-122.23709,0,1448846716
+107390,'107390','McKee & Selkirk',49.06257,-122.24797,0,1448846738
+107391,'107391','Old Clayburn & York',49.0569,-122.27125,0,1448846739
+107392,'107392','McKenzie & Lobban',49.04544,-122.2877,0,1448846740
+107393,'107393','McKenzie & Victory',49.04113,-122.28237,0,1448846741
+107394,'107394','Delair & Griffiths',49.03612,-122.26568,0,1448846742
+107395,'107395','Delair & Ackerman',49.03366,-122.25673,0,1448846743
+107396,'107396','Delair & Everett',49.03393,-122.2538,0,1448846744
+107397,'107397','Delair & Nickel',49.035,-122.24975,0,1448846745
+107398,'107398','Delair & A Campbell',49.03591,-122.24598,0,1448846746
+107399,'107399','Delair & Rockwell',49.03686,-122.24353,0,1448846747
+107400,'107400','N Parallel & Whatcom',49.03949,-122.22179,0,1448847420
+107401,'107401','36035 N Parallel Rd',49.03662,-122.22634,0,1448847421
+107402,'107402','35995 N Parallel Rd',49.03572,-122.22919,0,1448847422
+107403,'107403','1938 N Parallel Rd',49.03705,-122.23199,0,1448847423
+107404,'107404','Old Yale & Delair',49.03909,-122.23967,0,1448847424
+107405,'107405','Gladys & Lumar',49.04135,-122.27482,0,1448847425
+107406,'107406','Gladys & Serl',49.04302,-122.27805,0,1448847426
+107407,'107407','33991 Gladys Av',49.04512,-122.28302,0,1448847427
+107408,'107408','S Fraser & Minter',49.05121,-122.33352,0,1448847428
+107409,'107409','Peardonville & Livingstone',49.04682,-122.35254,0,1448847429
+107410,'107410','31251 Peardonville Rd',49.04592,-122.3585,0,1448847451
+107411,'107411','Townline & Wheel',49.04437,-122.3601,0,1448847452
+107412,'107412','Wheel & Townline',49.04382,-122.36073,0,1448847453
+107413,'107413','Wheel & Queen',49.04402,-122.36688,0,1448847454
+107414,'107414','Peardonville & Queen',49.0461,-122.36676,0,1448847455
+107415,'107415','31120 Peardonville Rd',49.04596,-122.36258,0,1448847456
+107416,'107416','Wheel & Carpenter',49.04374,-122.35823,0,1448847457
+107417,'107417','Windsor & Wheel',49.04423,-122.35532,0,1448847458
+107418,'107418','Peardonville & Windsor',49.04538,-122.35365,0,1448847459
+107419,'107419','Martens & Oakridge',49.04149,-122.35134,0,1448847460
+107420,'107420','Martens & Monarch',49.03978,-122.35141,0,1448847482
+107421,'107421','Marshall & Martens',49.03858,-122.35426,0,1448847483
+107422,'107422','Marshall & Carpenter',49.03865,-122.3584,0,1448847484
+107423,'107423','Townline & Marshall',49.03974,-122.36006,0,1448847485
+107424,'107424','2182 Townline Rd',49.04196,-122.36005,0,1448847486
+107425,'107425','31258 Peardonville Rd',49.04588,-122.35822,0,1448847487
+107426,'107426','Peardonville & Livingstone',49.04699,-122.35327,0,1448847488
+107427,'107427','31073 Peardonville Rd',49.04603,-122.36345,0,1448847489
+107428,'107428','Simpson & Peardonville',49.04624,-122.37234,0,1448847490
+107429,'107429','Mt Lehman & Simpson',49.04791,-122.38122,0,1448847491
+107430,'107430','Mt Lehman & Progressive',49.0493,-122.3812,0,1448847513
+107431,'107431','Mt Lehman & Canary',49.05259,-122.38115,0,1448847514
+107432,'107432','Fraser & Mt Lehman',49.05613,-122.38347,0,1448847515
+107433,'107433','Fraser & Ross',49.05758,-122.40535,0,1448847516
+107434,'107434','Fraser & Bradner',49.057,-122.42755,0,1448847517
+107435,'107435','Fraser & Cottonwood',49.05722,-122.44099,0,1448847518
+107436,'107436','Fraser & Lefeuvre',49.05743,-122.44953,0,1448847519
+107437,'107437','Fraser Hwy 27800 Blk',49.05755,-122.45445,0,1448847520
+107438,'107438','Swensson & Trolley',49.0512,-122.45324,0,1448847521
+107440,'107440','Lefeuvre & Junction',49.05278,-122.44866,0,1448847544
+107441,'107441','Lefeuvre & Trestle',49.05533,-122.44869,0,1448847545
+107442,'107442','Fraser & Lefeuvre',49.05732,-122.44713,0,1448847546
+107443,'107443','Fraser & Cottonwood',49.05714,-122.43986,0,1448847547
+107444,'107444','Fraser & Bradner',49.05693,-122.42861,0,1448847548
+107445,'107445','Fraser & Ross',49.05758,-122.40296,0,1448847549
+107446,'107446','Fraser & Mt Lehman',49.05603,-122.38424,0,1448847550
+107447,'107447','Mt Lehman & Canary',49.05243,-122.38122,0,1448847551
+107448,'107448','Mt Lehman & Grt Nor''n',49.04964,-122.38126,0,1448847552
+107449,'107449','Mt Lehman & Progressive',49.04759,-122.3813,0,1448847553
+107450,'107450','Simpson & Peardonville',49.0462,-122.37233,0,1448847575
+107451,'107451','1797 Mt Lehman Rd',49.0357,-122.37838,0,1448847576
+107452,'107452','Approach & Cornell',49.029,-122.37828,0,1448847577
+107453,'107453','Tower & Firecat',49.02948,-122.37578,0,1448847578
+107454,'107454','1818 Mt Lehman Rd',49.03577,-122.37831,0,1448847579
+107455,'107455','2178 Peardonville Rd',49.04225,-122.3746,0,1448847580
+107456,'107456','2344 Peardonville Rd',49.04505,-122.37147,0,1448847581
+107457,'107457','2353 Peardonville Rd',49.045,-122.37162,0,1448847582
+107458,'107458','Peardonville & Iron Mills',49.04084,-122.3763,0,1448847583
+107481,'107481','Latimer & Laburnum',49.06605,-122.2565,0,1448847669
+107483,'107483','Laburnum & Sussex',49.06414,-122.26257,0,1448847671
+107485,'107485','Gladys & Morey',49.05424,-122.28675,0,1448847673
+107486,'107486','Hwy 11 & McCallum',49.06679,-122.28612,0,1448847674
+107487,'107487','Riverside & Fore',49.11194,-122.29434,0,1448847675
+107488,'107488','Riverside & St Olaf',49.10761,-122.29427,0,1448847676
+107489,'107489','Riverside & Harris',49.10424,-122.29422,0,1448847677
+107490,'107490','Riverside & Harris',49.10431,-122.29415,0,1448847699
+107491,'107491','Riverside & Grace',49.10774,-122.2942,0,1448847700
+107492,'107492','Riverside & Fore',49.11183,-122.29428,0,1448847701
+107493,'107493','Marshall & Camden',49.04141,-122.24839,0,1448847702
+107494,'107494','Marshall & McCorkell',49.03861,-122.24923,0,1448847703
+107495,'107495','Marshall & Everett',49.03847,-122.25395,0,1448847704
+107496,'107496','Marshall & Sierra',49.03843,-122.25725,0,1448847705
+107498,'107498','Peardonville & Simpson',49.04622,-122.36898,0,1448847707
+107499,'107499','Bourquin Exch',49.04809,-122.30873,0,1448847708
+107500,'107500','Bourquin Exch',49.04825,-122.30893,0,1448848381
+107501,'107501','Bourquin Exch',49.0484,-122.30914,0,1448848382
+107740,'107740','276 St & Fraser Hwy',49.05696,-122.45979,0,1448850427
+107742,'107742','27440 28 Av',49.05317,-122.46455,0,1448850429
+107744,'107744','272 St & 28 Av',49.05383,-122.47064,0,1448850431
+107746,'107746','32 Av & 272 St',49.06046,-122.46927,0,1448850433
+107747,'107747','27410 32 Av',49.06048,-122.4648,0,1448850434
+107751,'107751','1 Av & Welton',49.13443,-122.30357,0,1448850459
+107752,'107752','1 Av & James',49.13445,-122.30825,0,1448850460
+107754,'107754','Junction Mall',49.13014,-122.31907,0,1448850462
+107755,'107755','Lougheed & Haig',49.13289,-122.3211,0,1448850463
+107756,'107756','Mission City Stn',49.13391,-122.30415,0,1448850464
+107758,'107758','Hurd & Lougheed',49.13347,-122.32942,0,1448850466
+107759,'107759','Hurd & Scott',49.13533,-122.33268,0,1448850467
+107761,'107761','Hurd & Pleasantview',49.13882,-122.3327,0,1448850490
+107762,'107762','7 Av & Hurd',49.14019,-122.33193,0,1448850491
+107763,'107763','7 Av & Blott',49.14019,-122.33036,0,1448850492
+107764,'107764','7 Av & Peterson',49.14019,-122.32535,0,1448850493
+107765,'107765','7 Av & Briskham',49.1402,-122.32041,0,1448850494
+107766,'107766','7 Av & Cedar',49.1402,-122.3177,0,1448850495
+107767,'107767','Cedar & 7 Av',49.1412,-122.31633,0,1448850496
+107768,'107768','Cedar & 10 Av',49.14313,-122.31627,0,1448850497
+107769,'107769','Cedar & Charnley',49.14536,-122.31615,0,1448850498
+107770,'107770','14 Av & Cedar',49.14742,-122.31739,0,1448850520
+107771,'107771','14 Av & Tanager',49.14742,-122.32227,0,1448850521
+107772,'107772','32400 14 Av',49.14745,-122.32705,0,1448850522
+107773,'107773','14 Av & Caribou',49.14745,-122.33138,0,1448850523
+107774,'107774','Holiday & Hurd',49.14474,-122.33348,0,1448850524
+107775,'107775','Holiday & Wren',49.14474,-122.33771,0,1448850525
+107776,'107776','Wren & Silverdale',49.14362,-122.33852,0,1448850526
+107777,'107777','Wren & Oriole',49.13982,-122.33842,0,1448850527
+107778,'107778','Wren & Westview',49.1379,-122.33838,0,1448850528
+107779,'107779','Wren & Hillcrest',49.13605,-122.33833,0,1448850529
+107781,'107781','Scott & Hurd',49.1351,-122.33313,0,1448850552
+107783,'107783','Mission Hls Mall',49.13253,-122.32061,0,1448850554
+107786,'107786','Murray & 6 Av',49.13905,-122.29984,0,1448850557
+107787,'107787','7 Av & Horne',49.1399,-122.30206,0,1448850558
+107788,'107788','Grand & 9 Av',49.14157,-122.30947,0,1448850559
+107789,'107789','Grand & 10 Av',49.14287,-122.30946,0,1448850560
+107790,'107790','Grand & 14 Av',49.14704,-122.30914,0,1448850582
+107791,'107791','Hyde & Arbutus',49.14975,-122.30907,0,1448850583
+107792,'107792','Best & Hyde',49.15099,-122.30872,0,1448850584
+107793,'107793','Best & Philbert',49.15079,-122.3032,0,1448850585
+107794,'107794','Cade Barr & Hawthorne',49.15351,-122.30183,0,1448850586
+107795,'107795','Cherry & Cade Barr',49.15464,-122.30255,0,1448850587
+107796,'107796','Cherry & Nottman',49.15465,-122.30741,0,1448850588
+107797,'107797','Cherry & Judith',49.15466,-122.31188,0,1448850589
+107798,'107798','Cherry & Cedar',49.15467,-122.31506,0,1448850590
+107800,'107800','Fennell & Mitchell',49.15672,-122.32037,0,1448851264
+107801,'107801','Cherry & Harris',49.15462,-122.31853,0,1448851265
+107802,'107802','Cedar & Cherry',49.15403,-122.31609,0,1448851266
+107803,'107803','Cedar & Adams',49.14987,-122.3161,0,1448851267
+107804,'107804','Cedar & 14 Av',49.14701,-122.31614,0,1448851268
+107805,'107805','Cedar & Charnley',49.14523,-122.31623,0,1448851269
+107806,'107806','Cedar & 10 Av',49.14188,-122.3164,0,1448851270
+107807,'107807','32719 Cedar Vly',49.13862,-122.31909,0,1448851271
+107817,'107817','7 Av & Horne',49.13976,-122.30207,0,1448851302
+107818,'107818','3 Av & Horne',49.13625,-122.30202,0,1448851303
+107819,'107819','3 Av & Horne',49.13621,-122.30181,0,1448851304
+107820,'107820','3 Av & Columbia',49.13618,-122.29674,0,1448851326
+107822,'107822','Stave Lk & 5A Av',49.13857,-122.29277,0,1448851328
+107823,'107823','Stave Lk & 7 Av',49.14009,-122.29275,0,1448851329
+107824,'107824','Stave Lk & 9 Av',49.14124,-122.29273,0,1448851330
+107825,'107825','Stave Lk & Prentis',49.14348,-122.29271,0,1448851331
+107826,'107826','11 Av & Dunsmuir',49.14458,-122.29842,0,1448851332
+107827,'107827','Horne & 12 Av',49.14539,-122.30236,0,1448851333
+107828,'107828','Horne & 13 Av',49.14691,-122.30238,0,1448851334
+107829,'107829','Cade Barr & Knight',49.14902,-122.3014,0,1448851335
+107830,'107830','Cherry & Aster',49.15457,-122.29862,0,1448851357
+107831,'107831','Harms & Cherry',49.15492,-122.29376,0,1448851358
+107832,'107832','Harms & D''ney Trnk',49.15765,-122.29389,0,1448851359
+107833,'107833','D''ney Trnk & Kimball',49.15818,-122.29,0,1448851360
+107834,'107834','D''ney Trnk & Stave Lk',49.15818,-122.28613,0,1448851361
+107835,'107835','Stave Lk & Cherry',49.15415,-122.28655,0,1448851362
+107836,'107836','Best & Melburn',49.15148,-122.28681,0,1448851363
+107838,'107838','Best & Cade Barr',49.15087,-122.30088,0,1448851365
+107839,'107839','Cade Barr & Laurel',49.1491,-122.30147,0,1448851366
+107840,'107840','Horne & 13 Av',49.14693,-122.30245,0,1448851388
+107841,'107841','Horne & 11 Av',49.14482,-122.30242,0,1448851389
+107842,'107842','11 Av & Dunsmuir',49.14454,-122.29838,0,1448851390
+107843,'107843','Stave Lk & 11 Av',49.14328,-122.29279,0,1448851391
+107844,'107844','Stave Lk & 9 Av',49.14126,-122.2928,0,1448851392
+107845,'107845','7 Av & Stave Lk',49.13984,-122.29321,0,1448851393
+107846,'107846','7 Av & Columbia',49.13985,-122.29643,0,1448851394
+107847,'107847','James & 7 Av',49.13942,-122.30718,0,1448851395
+107849,'107849','James & 4 Av',49.13734,-122.30711,0,1448851397
+107850,'107850','Alder & 7 Av',49.1399,-122.31339,0,1448851419
+107851,'107851','Alder & 4 Av',49.1373,-122.31341,0,1448851420
+107855,'107855','Draper & Douglas',49.1553,-122.2551,0,1448851424
+107856,'107856','Moffat & Lawrence',49.15128,-122.26061,0,1448851425
+107857,'107857','Manson & Norrish',49.14684,-122.2685,0,1448851426
+107859,'107859','Cedar & 3 Av',49.13636,-122.31654,0,1448851428
+107861,'107861','3 Av & Columbia',49.13622,-122.29778,0,1448851451
+107870,'107870','Rai & Wren',49.13272,-122.33696,0,1448851481
+107871,'107871','32110 Rai Av',49.13273,-122.33463,0,1448851482
+107877,'107877','Columbia & 5 Av',49.13823,-122.29748,0,1448851488
+107880,'107880','Hurd & Diamond',49.13745,-122.33269,0,1448851512
+107883,'107883','7 Av & Taulbut',49.13987,-122.3062,0,1448851515
+107884,'107884','Stave Lk & 4 Av',49.13683,-122.29277,0,1448851516
+108262,'108262','Bourquin Exch',49.04818,-122.30841,0,1448875477
+120002,'120002','Highstreet Mall',49.05903,-122.38056,0,1450482083
+120006,'120006','Old Clayburn & Beverley',49.06008,-122.26297,0,1450482087
+120007,'120007','Lougheed & Haig',49.13305,-122.32191,0,1450482088
+120011,'120011','Gladys & Cyril',49.04692,-122.28564,0,1450482113
+120012,'120012','Townline & Up Maclure',49.06067,-122.36007,0,1450482114
+120013,'120013','Hwy 11 & Harris',49.1046,-122.2899,0,1450482115
+120014,'120014','Hwy 11 & Harris',49.10315,-122.28984,0,1450482116
+120016,'120016','Old Clayburn & Beverley',49.06014,-122.26372,0,1450482118
+120017,'120017','Sandy Hl & Old Clayburn',49.07165,-122.24908,0,1450482119
+120018,'120018','Bevan & Ware',49.042,-122.30509,0,1450482120
+120022,'120022','McKenzie & Marshall',49.03918,-122.28224,0,1450482145
+120023,'120023','Clearbrook & Old Yale',49.05145,-122.33786,0,1450482146
+120024,'120024','McCallum P&R',49.03237,-122.29297,0,1450482147
+120026,'120026','36060 McKee Rd',49.07113,-122.22552,0,1450482149
+120027,'120027','35846 McKee Rd',49.07113,-122.23257,0,1450482150
+120028,'120028','35846 McKee Rd',49.07118,-122.23258,0,1450482151
+120031,'120031','Chances Casino',49.13245,-122.30021,0,1450482175
+120032,'120032','Bevan & Gladwin',49.04185,-122.31471,0,1450482176
+120033,'120033','Blueridge & Blue Jay',49.06601,-122.37144,0,1450482177
+120034,'120034','Blueridge & Crestview',49.06581,-122.37772,0,1450482178
+120035,'120035','Mt Lehman & Cardinal',49.0615,-122.38129,0,1450482179
+120037,'120037','Up Maclure & Ponderosa',49.06038,-122.35477,0,1450482181
+120038,'120038','Ponderosa & Spur',49.06252,-122.35433,0,1450482182
+120039,'120039','Ponderosa & Ridgeview',49.06518,-122.35435,0,1450482183
+120040,'120040','Ridgeview & Sidegrove',49.06572,-122.34927,0,1450482205
+120041,'120041','Blueridge & Thornhill',49.06705,-122.34456,0,1450482206
+120042,'120042','Up Maclure & Townline',49.06035,-122.35931,0,1450482207
+120043,'120043','Abbotsford Rec Ctr',49.0487,-122.26256,0,1450482208
+120044,'120044','Townline & Ridgeview',49.06523,-122.35987,0,1450482209
+120045,'120045','Up Maclure & Ponderosa',49.06031,-122.3548,0,1450482210
+120046,'120046','Highstreet & Cardinal',49.05906,-122.37751,0,1450482211
+120047,'120047','Maclure & Livingstone',49.055,-122.36833,0,1450482212
+120048,'120048','Maclure & Blue Jay',49.05522,-122.36934,0,1450482213
+120049,'120049','Townline & Firhill',49.06442,-122.35997,0,1450482214
+120050,'120050','Egglestone & Cedar',49.1583,-122.31732,0,1450482236
+120055,'120055','11 Av & Stave Lk',49.14477,-122.29285,0,1450482241
+120056,'120056','Scott & Wren',49.13514,-122.33785,0,1450482242
+120057,'120057','Taulbut & 10 Ave',49.14283,-122.30598,0,1450482243
+120058,'120058','Best & Forbes',49.15105,-122.29363,0,1450482244
+120059,'120059','D''ney Trnk & Hwy 7',49.15002,-122.25518,0,1450482245
+120061,'120061','Lo Sumas Mtn & Marshall',49.04901,-122.2235,0,1450482268
+120062,'120062','Junction Mall',49.13091,-122.31975,0,1450482269
+120063,'120063','Mission Exch',49.1353,-122.30299,0,1450482270
+120064,'120064','Mission Exch',49.13535,-122.3029,0,1450482271
+120067,'120067','Mission Walmart',49.13198,-122.34088,0,1450482274
+120068,'120068','Marshall & Mdws',49.03823,-122.33353,0,1450482275
+120069,'120069','Marshall & Majestic',49.03826,-122.32663,0,1450482276
+120070,'120070','Marshall & Griffiths',49.03824,-122.26487,0,1450482298
+120071,'120071','Hearthstone & Latimer',49.07425,-122.26152,0,1450482299
+120072,'120072','McDougall & McCallum',49.04557,-122.29225,0,1450482300
+120073,'120073','McDougall & Montrose',49.04564,-122.2901,0,1450482301
+120074,'120074','34895 Laburnum Av',49.06456,-122.25748,0,1450482302
+120075,'120075','Marshall & Salton',49.03884,-122.28717,0,1450482303
+120077,'120077','Cedar Vly & Hwy 7',49.13433,-122.32645,0,1450482305
diff --git a/src/main/res-next/raw/next_gtfs_rts_trip_stops b/src/main/res-next/raw/next_gtfs_rts_trip_stops
new file mode 100644
index 000000000..2bd67763b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_rts_trip_stops
@@ -0,0 +1,1151 @@
+100,120002,1,0
+100,107107,2,0
+100,107108,3,0
+100,107109,4,0
+100,107110,5,0
+100,107111,6,0
+100,107112,7,0
+100,107113,8,0
+100,120047,9,0
+100,107115,10,0
+100,107116,11,0
+100,107117,12,0
+100,107118,13,0
+100,107119,14,0
+100,107120,15,0
+100,107012,16,0
+100,107013,17,0
+100,107014,18,0
+100,107015,19,0
+100,107016,20,0
+100,107017,21,0
+100,107018,22,0
+100,107019,23,0
+100,108262,24,0
+100,107021,25,0
+100,107022,26,0
+100,107199,27,0
+100,107192,28,0
+100,107193,29,0
+100,107194,30,0
+100,107079,31,0
+100,120073,32,0
+100,107130,33,0
+100,107131,34,0
+100,107132,35,0
+100,107185,36,0
+100,107186,37,0
+100,107187,38,0
+100,107188,39,0
+100,107189,40,0
+100,107190,41,1
+101,107190,1,0
+101,107195,2,0
+101,107196,3,0
+101,107197,4,0
+101,120024,5,0
+101,107198,6,0
+101,107154,7,0
+101,107155,8,0
+101,107156,9,0
+101,107157,10,0
+101,120072,11,0
+101,107200,12,0
+101,107201,13,0
+101,107202,14,0
+101,107203,15,0
+101,107191,16,0
+101,107085,17,0
+101,107499,18,0
+101,107087,19,0
+101,107088,20,0
+101,107089,21,0
+101,107090,22,0
+101,107091,23,0
+101,107092,24,0
+101,107093,25,0
+101,107167,26,0
+101,107168,27,0
+101,107169,28,0
+101,107170,29,0
+101,107171,30,0
+101,107172,31,0
+101,120048,32,0
+101,120046,33,0
+101,120002,34,1
+200,120002,1,0
+200,107107,2,0
+200,107110,3,0
+200,107111,4,0
+200,105721,5,0
+200,105731,6,0
+200,120049,7,0
+200,120042,8,0
+200,120045,9,0
+200,120038,10,0
+200,120039,11,0
+200,120040,12,0
+200,107005,13,0
+200,107006,14,0
+200,107007,15,0
+200,107008,16,0
+200,107009,17,0
+200,107010,18,0
+200,107011,19,0
+200,120023,20,0
+200,107012,21,0
+200,107013,22,0
+200,107014,23,0
+200,107015,24,0
+200,107016,25,0
+200,107017,26,0
+200,107018,27,0
+200,107019,28,0
+200,108262,29,0
+200,107021,30,0
+200,107022,31,0
+200,107023,32,0
+200,107024,33,0
+200,107025,34,0
+200,107026,35,0
+200,107027,36,0
+200,120072,37,0
+200,107030,38,0
+200,107031,39,0
+200,107032,40,0
+200,107033,41,0
+200,107034,42,0
+200,107035,43,0
+200,120043,44,1
+201,120043,1,0
+201,107350,2,0
+201,107070,3,0
+201,107071,4,0
+201,107072,5,0
+201,107073,6,0
+201,107074,7,0
+201,107075,8,0
+201,107076,9,0
+201,107077,10,0
+201,107078,11,0
+201,107079,12,0
+201,120073,13,0
+201,107257,14,0
+201,107081,15,0
+201,107082,16,0
+201,107083,17,0
+201,107084,18,0
+201,107085,19,0
+201,107500,20,0
+201,107087,21,0
+201,107088,22,0
+201,107089,23,0
+201,107090,24,0
+201,107091,25,0
+201,107092,26,0
+201,107093,27,0
+201,107094,28,0
+201,107095,29,0
+201,107096,30,0
+201,107097,31,0
+201,107098,32,0
+201,120041,33,0
+201,107099,34,0
+201,107100,35,0
+201,107101,36,0
+201,107102,37,0
+201,120037,38,0
+201,107001,39,0
+201,120044,40,0
+201,105722,41,0
+201,120033,42,0
+201,120034,43,0
+201,120035,44,0
+201,120046,45,0
+201,120002,46,1
+300,107214,1,0
+300,107175,2,0
+300,107176,3,0
+300,107177,4,0
+300,107211,5,0
+300,107094,6,0
+300,107178,7,0
+300,107179,8,0
+300,107180,9,0
+300,107181,10,0
+300,107182,11,0
+300,107183,12,0
+300,107184,13,0
+300,107165,14,0
+300,107166,15,0
+300,108262,16,0
+300,107122,17,0
+300,107123,18,0
+300,107124,19,0
+300,107125,20,0
+300,107126,21,0
+300,107127,22,0
+300,107128,23,0
+300,107129,24,0
+300,107079,25,0
+300,120073,26,0
+300,107130,27,0
+300,107131,28,0
+300,107132,29,0
+300,107133,30,0
+300,107134,31,0
+300,107135,32,0
+300,107136,33,0
+300,107137,34,0
+300,107138,35,0
+300,107139,36,0
+300,107146,37,0
+300,107142,38,0
+300,107143,39,0
+300,107140,40,1
+301,107140,1,0
+301,107147,2,0
+301,107148,3,0
+301,107149,4,0
+301,107150,5,0
+301,107151,6,0
+301,120075,7,0
+301,107153,8,0
+301,107154,9,0
+301,107155,10,0
+301,107156,11,0
+301,107157,12,0
+301,120072,13,0
+301,107158,14,0
+301,107159,15,0
+301,107160,16,0
+301,107161,17,0
+301,107162,18,0
+301,107163,19,0
+301,107164,20,0
+301,107165,21,0
+301,107166,22,0
+301,107500,23,0
+301,107122,24,0
+301,107123,25,0
+301,107204,26,0
+301,107205,27,0
+301,107206,28,0
+301,107207,29,0
+301,107208,30,0
+301,107209,31,0
+301,107210,32,0
+301,107011,33,0
+301,120023,34,0
+301,107121,35,0
+301,107213,36,0
+301,107214,37,1
+400,120071,1,0
+400,107234,2,0
+400,107235,3,0
+400,107236,4,0
+400,107481,5,0
+400,120074,6,0
+400,107483,7,0
+400,107237,8,0
+400,107238,9,0
+400,107239,10,0
+400,107240,11,0
+400,107241,12,0
+400,107242,13,0
+400,107243,14,0
+400,107244,15,0
+400,107245,16,0
+400,107246,17,0
+400,107247,18,0
+400,107248,19,0
+400,107249,20,0
+400,107250,21,0
+400,107251,22,0
+400,107252,23,0
+400,107253,24,0
+400,107254,25,0
+400,107079,26,0
+400,120073,27,0
+400,107257,28,0
+400,107081,29,0
+400,107082,30,0
+400,107083,31,0
+400,107084,32,0
+400,107085,33,0
+400,107499,34,1
+400,120072,35,1
+401,108262,1,0
+401,107021,2,0
+401,107022,3,0
+401,107023,4,0
+401,107024,5,0
+401,107025,6,0
+401,107026,7,0
+401,107027,8,0
+401,120072,9,0
+401,107158,10,0
+401,107215,11,0
+401,107216,12,0
+401,107217,13,0
+401,107218,14,0
+401,107219,15,0
+401,107220,16,0
+401,107221,17,0
+401,107222,18,0
+401,107223,19,0
+401,107224,20,0
+401,107225,21,0
+401,107226,22,0
+401,107227,23,0
+401,107228,24,0
+401,107229,25,0
+401,107230,26,0
+401,107231,27,0
+401,107232,28,0
+401,120071,29,1
+500,107214,1,0
+500,107175,2,0
+500,107176,3,0
+500,107177,4,0
+500,107121,5,0
+500,107279,6,0
+500,107280,7,0
+500,120068,8,0
+500,107282,9,0
+500,107283,10,0
+500,107284,11,0
+500,107285,12,0
+500,107286,13,0
+500,107287,14,0
+500,107083,15,0
+500,107084,16,0
+500,107085,17,0
+500,107499,18,1
+501,108262,1,0
+501,107021,2,0
+501,107022,3,0
+501,107023,4,0
+501,107024,5,0
+501,107258,6,0
+501,107259,7,0
+501,107260,8,0
+501,107261,9,0
+501,107262,10,0
+501,107263,11,0
+501,107264,12,0
+501,107265,13,0
+501,120069,14,0
+501,107267,15,0
+501,107268,16,0
+501,107270,17,0
+501,107271,18,0
+501,107272,19,0
+501,107213,20,0
+501,107214,21,1
+601,107500,1,0
+601,107122,2,0
+601,107123,3,0
+601,107124,4,0
+601,107125,5,0
+601,107126,6,0
+601,107288,7,0
+601,107289,8,0
+601,107290,9,0
+601,107291,10,0
+601,107292,11,0
+601,107293,12,0
+601,107294,13,0
+601,107295,14,0
+601,107296,15,0
+601,107297,16,0
+601,107298,17,0
+601,107299,18,0
+601,107300,19,0
+601,107301,20,0
+601,107302,21,0
+601,107303,22,0
+601,107304,23,0
+601,107305,24,0
+601,107306,25,0
+601,107307,26,0
+601,107308,27,0
+601,107309,28,0
+601,107208,29,0
+601,107209,30,0
+601,107210,31,0
+601,107011,32,0
+601,120023,33,0
+601,107273,34,0
+601,107274,35,0
+601,107277,36,0
+601,107278,37,0
+601,107310,38,0
+601,107311,39,0
+601,107312,40,0
+601,107313,41,0
+601,107314,42,0
+601,107315,43,0
+601,107316,44,0
+601,107317,45,0
+601,107018,46,0
+601,107019,47,0
+601,107020,48,1
+700,108262,1,0
+700,107021,2,0
+700,107022,3,0
+700,107199,4,0
+700,107192,5,0
+700,107193,6,0
+700,107194,7,0
+700,120072,8,0
+700,107318,9,0
+700,107319,10,0
+700,107320,11,0
+700,107136,12,0
+700,107137,13,0
+700,107321,14,0
+700,107322,15,0
+700,120070,16,0
+700,107324,17,0
+700,107325,18,0
+700,107326,19,0
+700,107327,20,0
+700,107328,21,0
+700,107329,22,0
+700,107330,23,0
+700,107331,24,0
+700,107332,25,0
+700,107333,26,0
+700,107334,27,0
+700,107335,28,0
+700,107336,29,0
+700,120061,30,1
+700,107337,31,1
+701,120061,1,0
+701,107337,2,0
+701,107338,3,0
+701,107339,4,0
+701,107340,5,0
+701,107341,6,0
+701,107342,7,0
+701,107343,8,0
+701,107344,9,0
+701,107345,10,0
+701,107346,11,0
+701,107347,12,0
+701,107348,13,0
+701,107349,14,0
+701,107350,15,0
+701,107351,16,0
+701,107352,17,0
+701,107493,18,0
+701,107494,19,0
+701,107495,20,0
+701,107496,21,0
+701,107353,22,0
+701,107354,23,0
+701,107355,24,0
+701,107356,25,0
+701,107357,26,0
+701,107149,27,0
+701,107150,28,0
+701,120022,29,0
+701,107393,30,0
+701,107392,31,0
+701,120073,32,0
+701,120072,33,1
+701,107201,34,0
+701,107202,35,0
+701,107203,36,0
+701,107191,37,0
+701,107085,38,0
+701,107499,39,1
+900,108262,1,0
+900,107021,2,0
+900,107022,3,0
+900,107023,4,0
+900,107024,5,0
+900,107025,6,0
+900,107026,7,0
+900,107027,8,0
+900,120072,9,0
+900,107030,10,0
+900,107031,11,0
+900,107032,12,0
+900,107033,13,0
+900,107034,14,0
+900,107035,15,0
+900,107036,16,0
+900,107037,17,0
+900,107038,18,0
+900,107039,19,0
+900,107040,20,0
+900,107041,21,0
+900,107042,22,0
+900,107043,23,0
+900,107044,24,0
+900,107045,25,0
+900,107046,26,0
+900,107047,27,0
+900,107048,28,0
+900,107049,29,0
+900,107050,30,0
+900,107051,31,0
+900,107052,32,0
+900,107053,33,1
+901,107053,1,0
+901,107054,2,0
+901,107055,3,0
+901,107056,4,0
+901,107057,5,0
+901,107058,6,0
+901,107059,7,0
+901,107060,8,0
+901,107061,9,0
+901,107063,10,0
+901,107064,11,0
+901,107065,12,0
+901,107066,13,0
+901,107067,14,0
+901,107068,15,0
+901,107069,16,0
+901,107070,17,0
+901,107071,18,0
+901,107072,19,0
+901,107073,20,0
+901,107074,21,0
+901,107075,22,0
+901,107076,23,0
+901,107077,24,0
+901,107078,25,0
+901,107079,26,0
+901,120073,27,0
+901,107257,28,0
+901,107081,29,0
+901,107082,30,0
+901,107083,31,0
+901,107084,32,0
+901,107085,33,0
+901,107499,34,1
+901,120072,35,1
+1200,107190,1,0
+1200,107195,2,0
+1200,107196,3,0
+1200,107197,4,0
+1200,107364,5,0
+1200,107365,6,0
+1200,107366,7,0
+1200,107367,8,0
+1200,107368,9,0
+1200,107369,10,0
+1200,107370,11,0
+1200,120024,12,0
+1200,107198,13,0
+1200,107371,14,0
+1200,107372,15,0
+1200,107373,16,0
+1200,107286,17,0
+1200,107287,18,0
+1200,107083,19,0
+1200,107084,20,0
+1200,107085,21,0
+1200,107499,22,1
+1201,108262,1,0
+1201,107021,2,0
+1201,107022,3,0
+1201,107023,4,0
+1201,107024,5,0
+1201,107258,6,0
+1201,107259,7,0
+1201,107358,8,0
+1201,107359,9,0
+1201,107360,10,0
+1201,107361,11,0
+1201,107363,12,0
+1201,107186,13,0
+1201,107187,14,0
+1201,107188,15,0
+1201,107189,16,0
+1201,107190,17,1
+1500,107385,1,0
+1500,107386,2,0
+1500,107387,3,0
+1500,107388,4,0
+1500,120028,5,0
+1500,107389,6,0
+1500,107377,7,0
+1500,107390,8,0
+1500,107062,9,0
+1500,107056,10,0
+1500,107057,11,0
+1500,120016,12,0
+1500,107375,13,0
+1500,107391,14,0
+1500,107249,15,0
+1500,107250,16,0
+1500,107251,17,0
+1500,107252,18,0
+1500,107253,19,0
+1500,107254,20,0
+1500,107079,21,0
+1500,120073,22,1
+1500,120072,23,1
+1501,120073,1,0
+1501,107158,2,0
+1501,107215,3,0
+1501,107216,4,0
+1501,107217,5,0
+1501,107218,6,0
+1501,107219,7,0
+1501,107220,8,0
+1501,107221,9,0
+1501,107374,10,0
+1501,120006,11,0
+1501,105727,12,0
+1501,107061,13,0
+1501,107045,14,0
+1501,107046,15,0
+1501,107047,16,0
+1501,107378,17,0
+1501,107379,18,0
+1501,120027,19,0
+1501,120026,20,0
+1501,107380,21,0
+1501,107381,22,0
+1501,107382,23,0
+1501,107383,24,0
+1501,107384,25,0
+1501,107385,26,1
+1600,120072,1,0
+1600,107318,2,0
+1600,107319,3,0
+1600,107320,4,0
+1600,107136,5,0
+1600,107137,6,0
+1600,107321,7,0
+1600,107394,8,0
+1600,107395,9,0
+1600,107396,10,0
+1600,107397,11,0
+1600,107398,12,0
+1600,107399,13,0
+1600,107331,14,0
+1600,107332,15,0
+1600,107333,16,0
+1600,107334,17,0
+1600,107335,18,0
+1600,107400,19,1
+1601,107400,1,0
+1601,107401,2,0
+1601,107402,3,0
+1601,107403,4,0
+1601,107404,5,0
+1601,107348,6,0
+1601,107349,7,0
+1601,107350,8,0
+1601,107351,9,0
+1601,107352,10,0
+1601,107353,11,0
+1601,107354,12,0
+1601,107355,13,0
+1601,107356,14,0
+1601,107405,15,0
+1601,107406,16,0
+1601,107407,17,0
+1601,120011,18,0
+1601,107078,19,0
+1601,107079,20,0
+1601,120073,21,1
+1700,107417,1,0
+1700,107418,2,0
+1700,107419,3,0
+1700,107420,4,0
+1700,107421,5,0
+1700,107422,6,0
+1700,107423,7,0
+1700,107424,8,0
+1700,107412,9,0
+1700,107413,10,0
+1700,107414,11,0
+1700,107415,12,0
+1700,107425,13,0
+1700,107426,14,0
+1700,107276,15,0
+1700,107175,16,0
+1700,107176,17,0
+1700,107177,18,0
+1700,107012,19,0
+1700,107013,20,0
+1700,107014,21,0
+1700,107015,22,0
+1700,107016,23,0
+1700,107017,24,0
+1700,107018,25,0
+1700,107019,26,0
+1700,107020,27,1
+1701,107501,1,0
+1701,107087,2,0
+1701,107088,3,0
+1701,107089,4,0
+1701,107090,5,0
+1701,107091,6,0
+1701,107408,7,0
+1701,107273,8,0
+1701,107274,9,0
+1701,107275,10,0
+1701,107409,11,0
+1701,107410,12,0
+1701,107411,13,0
+1701,107416,14,0
+1701,107417,15,1
+2100,107746,1,0
+2100,107747,2,0
+2100,107740,3,0
+2100,107438,4,0
+2100,107440,5,0
+2100,107441,6,0
+2100,107442,7,0
+2100,107443,8,0
+2100,107444,9,0
+2100,107445,10,0
+2100,107446,11,0
+2100,107447,12,0
+2100,107448,13,0
+2100,107449,14,0
+2100,107450,15,0
+2100,107451,16,0
+2100,107452,17,0
+2100,107453,18,0
+2100,107454,19,0
+2100,107455,20,0
+2100,107456,21,0
+2100,107414,22,0
+2100,107415,23,0
+2100,107425,24,0
+2100,107426,25,0
+2100,107276,26,0
+2100,107175,27,0
+2100,107176,28,0
+2100,107177,29,0
+2100,107012,30,0
+2100,107013,31,0
+2100,107014,32,0
+2100,107015,33,0
+2100,107016,34,0
+2100,107017,35,0
+2100,107018,36,0
+2100,107019,37,0
+2100,107020,38,1
+2101,107499,1,0
+2101,107087,2,0
+2101,107088,3,0
+2101,107089,4,0
+2101,107090,5,0
+2101,107091,6,0
+2101,107408,7,0
+2101,107273,8,0
+2101,107274,9,0
+2101,107275,10,0
+2101,107409,11,0
+2101,107410,12,0
+2101,107427,13,0
+2101,107498,14,0
+2101,107457,15,0
+2101,107458,16,0
+2101,107451,17,0
+2101,107452,18,0
+2101,107453,19,0
+2101,107454,20,0
+2101,107428,21,0
+2101,107429,22,0
+2101,107430,23,0
+2101,107431,24,0
+2101,107432,25,0
+2101,107433,26,0
+2101,107434,27,0
+2101,107435,28,0
+2101,107436,29,0
+2101,107437,30,0
+2101,107740,31,0
+2101,107742,32,0
+2101,107744,33,0
+2101,107746,34,1
+2201,107501,1,0
+2201,107087,2,0
+2201,107088,3,0
+2201,107089,4,0
+2201,107090,5,0
+2201,105733,6,0
+2201,105738,7,0
+2201,105725,8,0
+2201,107097,9,0
+2201,105724,10,0
+2201,105723,11,0
+2201,105730,12,0
+2201,105731,13,0
+2201,120049,14,0
+2201,120012,15,0
+2201,105736,16,0
+2201,107116,17,0
+2201,107117,18,0
+2201,107118,19,0
+2201,107119,20,0
+2201,107094,21,0
+2201,107095,22,0
+2201,107096,23,0
+2201,107308,24,0
+2201,107309,25,0
+2201,105734,26,0
+2201,105735,27,0
+2201,107015,28,0
+2201,107016,29,0
+2201,107017,30,0
+2201,107018,31,0
+2201,107019,32,0
+2201,107020,33,1
+2400,107500,1,0
+2400,107021,2,0
+2400,107022,3,0
+2400,107023,4,0
+2400,107024,5,0
+2400,120018,6,0
+2400,107213,7,0
+2400,107214,8,0
+2400,107175,9,0
+2400,107176,10,0
+2400,107177,11,0
+2400,107012,12,0
+2400,107013,13,0
+2400,107014,14,0
+2400,105733,15,0
+2400,105738,16,0
+2400,105737,17,0
+2400,105739,18,0
+2400,105729,19,0
+2400,107162,20,0
+2400,107163,21,0
+2400,107164,22,0
+2400,107165,23,0
+2400,107166,24,0
+2400,107499,25,1
+2401,107500,1,0
+2401,107122,2,0
+2401,107123,3,0
+2401,107124,4,0
+2401,107125,5,0
+2401,107126,6,0
+2401,107288,7,0
+2401,107289,8,0
+2401,107290,9,0
+2401,107291,10,0
+2401,107292,11,0
+2401,107293,12,0
+2401,107294,13,0
+2401,107295,14,0
+2401,107296,15,0
+2401,107297,16,0
+2401,107298,17,0
+2401,107299,18,0
+2401,107300,19,0
+2401,107301,20,0
+2401,107302,21,0
+2401,107303,22,0
+2401,107304,23,0
+2401,107305,24,0
+2401,107306,25,0
+2401,107307,26,0
+2401,107308,27,0
+2401,107309,28,0
+2401,105734,29,0
+2401,105735,30,0
+2401,107091,31,0
+2401,107408,32,0
+2401,107273,33,0
+2401,107274,34,0
+2401,107277,35,0
+2401,107278,36,0
+2401,107310,37,0
+2401,107311,38,0
+2401,107312,39,0
+2401,105732,40,0
+2401,120032,41,0
+2401,107083,42,0
+2401,107084,43,0
+2401,107085,44,0
+2401,107499,45,1
+2600,105726,1,0
+2600,107481,2,0
+2600,120074,3,0
+2600,107247,4,0
+2600,107248,5,0
+2600,107374,6,0
+2600,120006,7,0
+2600,105727,8,0
+2600,120017,9,0
+2600,107390,10,0
+2600,107063,11,0
+2600,107064,12,0
+2600,107065,13,0
+2600,107066,14,0
+2600,107067,15,0
+2600,107068,16,0
+2600,107069,17,0
+2600,107070,18,0
+2600,107071,19,0
+2600,107072,20,0
+2600,107073,21,0
+2600,107074,22,0
+2600,107075,23,0
+2600,107076,24,0
+2600,107077,25,0
+2600,107078,26,0
+2600,107079,27,0
+2600,120073,28,0
+2600,107257,29,0
+2600,107081,30,0
+2600,107082,31,0
+2600,107083,32,0
+2600,107084,33,0
+2600,107085,34,0
+2600,107499,35,1
+2601,108262,1,0
+2601,107021,2,0
+2601,107022,3,0
+2601,107023,4,0
+2601,107024,5,0
+2601,107025,6,0
+2601,107026,7,0
+2601,107027,8,0
+2601,120072,9,0
+2601,107030,10,0
+2601,107031,11,0
+2601,107032,12,0
+2601,107033,13,0
+2601,107034,14,0
+2601,107035,15,0
+2601,107036,16,0
+2601,107037,17,0
+2601,107038,18,0
+2601,107039,19,0
+2601,107040,20,0
+2601,107041,21,0
+2601,107042,22,0
+2601,107043,23,0
+2601,107044,24,0
+2601,107045,25,0
+2601,107046,26,0
+2601,107047,27,0
+2601,107048,28,0
+2601,107049,29,0
+2601,107050,30,0
+2601,107051,31,0
+2601,107052,32,0
+2601,107053,33,0
+2601,107054,34,0
+2601,107055,35,0
+2601,107056,36,0
+2601,107057,37,0
+2601,120016,38,0
+2601,107375,39,0
+2601,107391,40,0
+2601,107222,41,0
+2601,107223,42,0
+2601,107228,43,0
+2601,105726,44,1
+3100,107501,1,0
+3100,107122,2,0
+3100,107123,3,0
+3100,107124,4,0
+3100,107125,5,0
+3100,107126,6,0
+3100,107127,7,0
+3100,107128,8,0
+3100,107129,9,0
+3100,107215,10,0
+3100,107485,11,0
+3100,107486,12,0
+3100,107490,13,0
+3100,107491,14,0
+3100,107492,15,0
+3100,120013,16,0
+3100,107754,17,0
+3100,107755,18,0
+3100,107756,19,0
+3100,107751,20,0
+3100,120063,21,1
+3100,120064,22,1
+3101,120064,1,0
+3101,107756,2,0
+3101,107751,3,0
+3101,107752,4,0
+3101,120007,5,0
+3101,107754,6,0
+3101,107487,7,0
+3101,107488,8,0
+3101,107489,9,0
+3101,120014,10,0
+3101,107256,11,0
+3101,107255,12,0
+3101,107254,13,0
+3101,107159,14,0
+3101,107160,15,0
+3101,107161,16,0
+3101,107162,17,0
+3101,107163,18,0
+3101,107164,19,0
+3101,107165,20,0
+3101,107166,21,0
+3101,107020,22,1
+3200,107773,1,0
+3200,107774,2,0
+3200,107775,3,0
+3200,107776,4,0
+3200,107777,5,0
+3200,107778,6,0
+3200,107779,7,0
+3200,107870,8,0
+3200,107871,9,0
+3200,107755,10,0
+3200,107756,11,0
+3200,107751,12,0
+3200,120063,13,1
+3200,120064,14,1
+3201,120064,1,0
+3201,107756,2,0
+3201,107751,3,0
+3201,107752,4,0
+3201,120007,5,0
+3201,107758,6,0
+3201,107759,7,0
+3201,107880,8,0
+3201,107761,9,0
+3201,107762,10,0
+3201,107763,11,0
+3201,107764,12,0
+3201,107765,13,0
+3201,107766,14,0
+3201,107767,15,0
+3201,107768,16,0
+3201,107769,17,0
+3201,107770,18,0
+3201,107771,19,0
+3201,107772,20,0
+3201,107773,21,1
+3300,120050,1,0
+3300,107800,2,0
+3300,107801,3,0
+3300,107802,4,0
+3300,107803,5,0
+3300,107804,6,0
+3300,107805,7,0
+3300,107806,8,0
+3300,107807,9,0
+3300,120077,10,0
+3300,107755,11,0
+3300,107756,12,0
+3300,107751,13,0
+3300,120063,14,1
+3300,120064,15,1
+3301,120063,1,0
+3301,107751,2,0
+3301,107756,3,0
+3301,107819,4,0
+3301,107786,5,0
+3301,107787,6,0
+3301,107883,7,0
+3301,107788,8,0
+3301,107789,9,0
+3301,107790,10,0
+3301,107791,11,0
+3301,107792,12,0
+3301,107793,13,0
+3301,107794,14,0
+3301,107795,15,0
+3301,107796,16,0
+3301,107797,17,0
+3301,107798,18,0
+3301,120050,19,1
+3400,107834,1,0
+3400,107835,2,0
+3400,107836,3,0
+3400,120058,4,0
+3400,107838,5,0
+3400,107839,6,0
+3400,107840,7,0
+3400,107841,8,0
+3400,107842,9,0
+3400,107843,10,0
+3400,107844,11,0
+3400,107845,12,0
+3400,107846,13,0
+3400,107787,14,0
+3400,107883,15,0
+3400,107847,16,0
+3400,107756,17,0
+3400,107751,18,0
+3400,120063,19,1
+3400,107819,20,1
+3400,120064,21,1
+3401,120063,1,0
+3401,107751,2,0
+3401,107756,3,0
+3401,107819,4,0
+3401,107820,5,0
+3401,107884,6,0
+3401,107822,7,0
+3401,107823,8,0
+3401,107824,9,0
+3401,107825,10,0
+3401,120055,11,0
+3401,107826,12,0
+3401,107827,13,0
+3401,107828,14,0
+3401,107829,15,0
+3401,107794,16,0
+3401,107830,17,0
+3401,107831,18,0
+3401,107832,19,0
+3401,107833,20,0
+3401,107834,21,1
+3500,107855,1,0
+3500,107856,2,0
+3500,107857,3,0
+3500,107751,4,0
+3500,120063,5,1
+3501,120063,1,0
+3501,107756,2,0
+3501,120059,3,0
+3501,107855,4,1
+3900,120063,1,0
+3900,107751,2,0
+3900,107752,3,0
+3900,107756,4,0
+3900,120031,5,0
+3900,120062,6,0
+3900,107783,7,0
+3900,120007,8,0
+3900,120067,9,0
+3900,107870,10,0
+3900,107871,11,0
+3900,120056,12,0
+3900,107781,13,0
+3900,107759,14,0
+3900,107880,15,0
+3900,107761,16,0
+3900,107762,17,0
+3900,107763,18,0
+3900,107764,19,0
+3900,107765,20,0
+3900,107766,21,0
+3900,107850,22,0
+3900,107851,23,0
+3900,107859,24,0
+3900,107849,25,0
+3900,107788,26,0
+3900,107789,27,0
+3900,120057,28,0
+3900,107817,29,0
+3900,107877,30,0
+3900,107861,31,0
+3900,107818,32,0
diff --git a/src/main/res-next/raw/next_gtfs_rts_trips b/src/main/res-next/raw/next_gtfs_rts_trips
new file mode 100644
index 000000000..21b13b6c5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_rts_trips
@@ -0,0 +1,41 @@
+100,0,'Abbotsford',1
+101,0,'Highstreet Mall',1
+200,0,'Abbotsford Rec Ctr',2
+201,0,'Highstreet Mall',2
+301,0,'Clearbrook',3
+300,0,'Huntingdon',3
+400,0,'Bourquin Exch',4
+401,0,'Saddle',4
+500,0,'Bourquin Exch',5
+501,0,'Peardonville & Grant',5
+601,0,'Gladwin',6
+701,0,'Bourquin Exch',7
+700,0,'Sumas Mtn / To McMillan',7
+901,0,'Bourquin Exch',9
+900,0,'McKee',9
+1200,0,'Bourquin Exch',12
+1201,0,'UFV',12
+1501,0,'Auguston',15
+1500,0,'Montrose Exch',15
+1600,0,'McMillan',16
+1601,0,'Montrose Exch',16
+1700,0,'Bourquin Exch',17
+1701,0,'Ind',17
+2101,0,'Aldergrove',21
+2100,0,'Bourquin Exch',21
+2201,0,'East Townline',22
+2401,0,'AM',24
+2400,0,'PM',24
+2600,0,'Bourquin Exch',26
+2601,0,'Sandy Hl',26
+3101,0,'Bourquin Exch',31
+3100,0,'Mission Exch',31
+3200,0,'Mission Exch',32
+3201,0,'West Hts',32
+3301,0,'Cedar Vly',33
+3300,0,'Mission Exch',33
+3401,0,'East Side',34
+3400,0,'Mission Exch',34
+3501,0,'Hatzic',35
+3500,0,'Mission Exch',35
+3900,0,'Shopper Shuttle',39
diff --git a/src/main/res-next/raw/next_gtfs_schedule_service_dates b/src/main/res-next/raw/next_gtfs_schedule_service_dates
new file mode 100644
index 000000000..cfd8ce583
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_service_dates
@@ -0,0 +1,154 @@
+'2357',20240107
+'2358',20240108
+'2360',20240108
+'2358',20240109
+'2361',20240109
+'2358',20240110
+'2361',20240110
+'2358',20240111
+'2361',20240111
+'2358',20240112
+'2361',20240112
+'2363',20240113
+'2357',20240114
+'2358',20240115
+'2360',20240115
+'2358',20240116
+'2361',20240116
+'2358',20240117
+'2361',20240117
+'2358',20240118
+'2361',20240118
+'2358',20240119
+'2361',20240119
+'2363',20240120
+'2357',20240121
+'2358',20240122
+'2360',20240122
+'2358',20240123
+'2361',20240123
+'2358',20240124
+'2361',20240124
+'2358',20240125
+'2361',20240125
+'2358',20240126
+'2361',20240126
+'2363',20240127
+'2357',20240128
+'2358',20240129
+'2360',20240129
+'2358',20240130
+'2361',20240130
+'2358',20240131
+'2361',20240131
+'2358',20240201
+'2361',20240201
+'2358',20240202
+'2361',20240202
+'2363',20240203
+'2357',20240204
+'2358',20240205
+'2360',20240205
+'2358',20240206
+'2361',20240206
+'2358',20240207
+'2361',20240207
+'2358',20240208
+'2361',20240208
+'2358',20240209
+'2361',20240209
+'2363',20240210
+'2357',20240211
+'2358',20240212
+'2360',20240212
+'2358',20240213
+'2361',20240213
+'2358',20240214
+'2361',20240214
+'2358',20240215
+'2361',20240215
+'2358',20240216
+'2361',20240216
+'2363',20240217
+'2357',20240218
+'2357',20240219
+'2358',20240220
+'2361',20240220
+'2358',20240221
+'2361',20240221
+'2358',20240222
+'2361',20240222
+'2358',20240223
+'2361',20240223
+'2363',20240224
+'2357',20240225
+'2358',20240226
+'2360',20240226
+'2358',20240227
+'2361',20240227
+'2358',20240228
+'2361',20240228
+'2358',20240229
+'2361',20240229
+'2358',20240301
+'2361',20240301
+'2363',20240302
+'2357',20240303
+'2358',20240304
+'2360',20240304
+'2358',20240305
+'2361',20240305
+'2358',20240306
+'2361',20240306
+'2358',20240307
+'2361',20240307
+'2358',20240308
+'2361',20240308
+'2363',20240309
+'2357',20240310
+'2358',20240311
+'2360',20240311
+'2358',20240312
+'2361',20240312
+'2358',20240313
+'2361',20240313
+'2358',20240314
+'2361',20240314
+'2358',20240315
+'2361',20240315
+'2363',20240316
+'2357',20240317
+'2358',20240318
+'2360',20240318
+'2358',20240319
+'2361',20240319
+'2358',20240320
+'2361',20240320
+'2358',20240321
+'2361',20240321
+'2358',20240322
+'2361',20240322
+'2363',20240323
+'2357',20240324
+'2358',20240325
+'2360',20240325
+'2358',20240326
+'2361',20240326
+'2358',20240327
+'2361',20240327
+'2358',20240328
+'2361',20240328
+'2357',20240329
+'2363',20240330
+'2357',20240331
+'2358',20240401
+'2360',20240401
+'2358',20240402
+'2361',20240402
+'2358',20240403
+'2361',20240403
+'2358',20240404
+'2361',20240404
+'2358',20240405
+'2361',20240405
+'2363',20240406
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105721 b/src/main/res-next/raw/next_gtfs_schedule_stop_105721
new file mode 100644
index 000000000..852a6d84f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105721
@@ -0,0 +1,5 @@
+'2357',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,53900,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105722 b/src/main/res-next/raw/next_gtfs_schedule_stop_105722
new file mode 100644
index 000000000..4bd50179e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105722
@@ -0,0 +1,5 @@
+'2357',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,110000,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,110000,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105723 b/src/main/res-next/raw/next_gtfs_schedule_stop_105723
new file mode 100644
index 000000000..21d8907e3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105723
@@ -0,0 +1,3 @@
+'2358',2201,145800,,'',0
+'2360',2201,84700,,'',0
+'2361',2201,81700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105724 b/src/main/res-next/raw/next_gtfs_schedule_stop_105724
new file mode 100644
index 000000000..0079d3082
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105724
@@ -0,0 +1,3 @@
+'2358',2201,145500,,'',0
+'2360',2201,84400,,'',0
+'2361',2201,81400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105725 b/src/main/res-next/raw/next_gtfs_schedule_stop_105725
new file mode 100644
index 000000000..114a3b6f0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105725
@@ -0,0 +1,3 @@
+'2358',2201,145200,,'',0
+'2360',2201,84100,,'',0
+'2361',2201,81100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105726 b/src/main/res-next/raw/next_gtfs_schedule_stop_105726
new file mode 100644
index 000000000..bf2fb398c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105726
@@ -0,0 +1,2 @@
+'2358',2600,80500,,'',0,63600,0,'Montrose Exch Only',0
+'2358',2601,80500,4,'',0,63600,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105727 b/src/main/res-next/raw/next_gtfs_schedule_stop_105727
new file mode 100644
index 000000000..cdc2bcee7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105727
@@ -0,0 +1,3 @@
+'2358',1501,62200,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2600,145100,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105729 b/src/main/res-next/raw/next_gtfs_schedule_stop_105729
new file mode 100644
index 000000000..f7bcc91ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105729
@@ -0,0 +1 @@
+'2358',2400,144700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105730 b/src/main/res-next/raw/next_gtfs_schedule_stop_105730
new file mode 100644
index 000000000..b94704550
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105730
@@ -0,0 +1,3 @@
+'2358',2201,150100,,'',0
+'2360',2201,84900,,'',0
+'2361',2201,81900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105731 b/src/main/res-next/raw/next_gtfs_schedule_stop_105731
new file mode 100644
index 000000000..cabff2d23
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105731
@@ -0,0 +1,8 @@
+'2357',200,62100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,53900,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111500,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
+'2358',2201,150400,,'',0
+'2360',2201,85100,,'',0
+'2361',2201,82100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105732 b/src/main/res-next/raw/next_gtfs_schedule_stop_105732
new file mode 100644
index 000000000..ac9734be5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105732
@@ -0,0 +1 @@
+'2358',2401,80700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105733 b/src/main/res-next/raw/next_gtfs_schedule_stop_105733
new file mode 100644
index 000000000..871e117a5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105733
@@ -0,0 +1,4 @@
+'2358',2201,144900,,'',0
+'2360',2201,83900,,'',0
+'2361',2201,80900,,'',0
+'2358',2400,143600,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105734 b/src/main/res-next/raw/next_gtfs_schedule_stop_105734
new file mode 100644
index 000000000..16ef8b0fa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105734
@@ -0,0 +1,4 @@
+'2358',2201,151900,,'',0
+'2360',2201,90200,,'',0
+'2361',2201,83200,,'',0
+'2358',2401,75800,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105735 b/src/main/res-next/raw/next_gtfs_schedule_stop_105735
new file mode 100644
index 000000000..d8a7aef52
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105735
@@ -0,0 +1,4 @@
+'2358',2201,151900,,'',0
+'2360',2201,90300,,'',0
+'2361',2201,83300,,'',0
+'2358',2401,75900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105736 b/src/main/res-next/raw/next_gtfs_schedule_stop_105736
new file mode 100644
index 000000000..96b3e16fa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105736
@@ -0,0 +1,3 @@
+'2358',2201,150700,,'',0
+'2360',2201,85300,,'',0
+'2361',2201,82300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105737 b/src/main/res-next/raw/next_gtfs_schedule_stop_105737
new file mode 100644
index 000000000..fafbb8dad
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105737
@@ -0,0 +1 @@
+'2358',2400,143900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105738 b/src/main/res-next/raw/next_gtfs_schedule_stop_105738
new file mode 100644
index 000000000..85b1f64d1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105738
@@ -0,0 +1,4 @@
+'2358',2201,145100,,'',0
+'2360',2201,84000,,'',0
+'2361',2201,81000,,'',0
+'2358',2400,143700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_105739 b/src/main/res-next/raw/next_gtfs_schedule_stop_105739
new file mode 100644
index 000000000..f7bcc91ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_105739
@@ -0,0 +1 @@
+'2358',2400,144700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107001 b/src/main/res-next/raw/next_gtfs_schedule_stop_107001
new file mode 100644
index 000000000..f23f5d3f8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107001
@@ -0,0 +1,5 @@
+'2357',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105800,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,105800,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107005 b/src/main/res-next/raw/next_gtfs_schedule_stop_107005
new file mode 100644
index 000000000..69c118a53
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107005
@@ -0,0 +1,5 @@
+'2357',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
+'2361',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
+'2363',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107006 b/src/main/res-next/raw/next_gtfs_schedule_stop_107006
new file mode 100644
index 000000000..15f591871
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107006
@@ -0,0 +1,5 @@
+'2357',200,62800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54500,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112200,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
+'2361',200,112200,0,'McMillan',0,18000,0,'McMillan',0,14700,0,'McMillan',0,19500,0,'McMillan',0
+'2363',200,61100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107007 b/src/main/res-next/raw/next_gtfs_schedule_stop_107007
new file mode 100644
index 000000000..a4ab61457
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107007
@@ -0,0 +1,5 @@
+'2357',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54600,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112300,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112300,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107008 b/src/main/res-next/raw/next_gtfs_schedule_stop_107008
new file mode 100644
index 000000000..3acb64ddc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107008
@@ -0,0 +1,5 @@
+'2357',200,62900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112400,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112400,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107009 b/src/main/res-next/raw/next_gtfs_schedule_stop_107009
new file mode 100644
index 000000000..4b291d85b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107009
@@ -0,0 +1,5 @@
+'2357',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54700,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112500,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112500,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107010 b/src/main/res-next/raw/next_gtfs_schedule_stop_107010
new file mode 100644
index 000000000..de75d8706
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107010
@@ -0,0 +1,5 @@
+'2357',200,63000,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14800,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61300,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107011 b/src/main/res-next/raw/next_gtfs_schedule_stop_107011
new file mode 100644
index 000000000..9e68ea8b2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107011
@@ -0,0 +1,13 @@
+'2357',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6100,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112600,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60500,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2358',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8600,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91700,,'',0,4000,,'',0
+'2361',601,91700,,'',0,4000,,'',0
+'2363',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107012 b/src/main/res-next/raw/next_gtfs_schedule_stop_107012
new file mode 100644
index 000000000..cc94d0e9d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107012
@@ -0,0 +1,15 @@
+'2357',100,61500,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53500,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61800,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2357',200,63200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54900,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112800,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112800,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61500,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65500,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
+'2360',2100,82300,,'',0
+'2361',2100,82300,,'',0
+'2363',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107013 b/src/main/res-next/raw/next_gtfs_schedule_stop_107013
new file mode 100644
index 000000000..28dc58978
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107013
@@ -0,0 +1,15 @@
+'2357',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2357',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55000,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112900,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112900,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65600,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
+'2360',2100,82400,,'',0
+'2361',2100,82400,,'',0
+'2363',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143300,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107014 b/src/main/res-next/raw/next_gtfs_schedule_stop_107014
new file mode 100644
index 000000000..d248a114c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107014
@@ -0,0 +1,15 @@
+'2357',100,61600,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2357',200,63300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55000,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113000,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,113000,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61600,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65100,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65600,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10900,,'',0
+'2360',2100,82500,,'',0
+'2361',2100,82500,,'',0
+'2363',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107015 b/src/main/res-next/raw/next_gtfs_schedule_stop_107015
new file mode 100644
index 000000000..0492e5a73
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107015
@@ -0,0 +1,17 @@
+'2357',100,61700,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53700,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,62000,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55100,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,113100,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2361',200,113100,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2363',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
+'2357',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65700,,'',0,7600,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10800,,'',0
+'2360',2100,82500,,'',0
+'2361',2100,82500,,'',0
+'2363',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13000,,'',0
+'2358',2201,152000,,'',0
+'2360',2201,90400,,'',0
+'2361',2201,83400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107016 b/src/main/res-next/raw/next_gtfs_schedule_stop_107016
new file mode 100644
index 000000000..c9b1b23bc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107016
@@ -0,0 +1,17 @@
+'2357',100,61700,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53700,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62000,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55200,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,113200,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2361',200,113200,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2363',200,61700,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
+'2357',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65800,,'',0,7600,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,10800,,'',0
+'2360',2100,82600,,'',0
+'2361',2100,82600,,'',0
+'2363',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13000,,'',0
+'2358',2201,152100,,'',0
+'2360',2201,90400,,'',0
+'2361',2201,83400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107017 b/src/main/res-next/raw/next_gtfs_schedule_stop_107017
new file mode 100644
index 000000000..ed3b7c651
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107017
@@ -0,0 +1,17 @@
+'2357',100,61800,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0
+'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63500,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55200,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113300,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2361',200,113300,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3500,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2358',1700,65300,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
+'2357',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65800,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15500,,'',0,10900,,'',0
+'2360',2100,82700,,'',0
+'2361',2100,82700,,'',0
+'2363',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13100,,'',0
+'2358',2201,152200,,'',0
+'2360',2201,90500,,'',0
+'2361',2201,83500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107018 b/src/main/res-next/raw/next_gtfs_schedule_stop_107018
new file mode 100644
index 000000000..c7dd1704f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107018
@@ -0,0 +1,22 @@
+'2357',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55300,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113400,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2361',200,113400,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
+'2360',601,92600,,'',0,8000,,'',0
+'2361',601,92600,,'',0,8000,,'',0
+'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'2358',1700,65400,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
+'2357',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65900,,'',0,7700,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,7500,,'',0,5300,,'',0,15500,,'',0,10900,,'',0
+'2360',2100,82800,,'',0
+'2361',2100,82800,,'',0
+'2363',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13100,,'',0
+'2358',2201,152200,,'',0
+'2360',2201,90600,,'',0
+'2361',2201,83600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107019 b/src/main/res-next/raw/next_gtfs_schedule_stop_107019
new file mode 100644
index 000000000..174acfe15
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107019
@@ -0,0 +1,22 @@
+'2357',100,61800,0,'UFV',0,3900,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53800,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6300,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62100,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,5300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55300,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113500,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2361',200,113500,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,15400,0,'McMillan',0
+'2363',200,61800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
+'2360',601,92600,,'',0,8000,,'',0
+'2361',601,92600,,'',0,8000,,'',0
+'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'2358',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
+'2357',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65900,,'',0,7700,,'',0,18900,,'',0,12000,,'',0,11400,,'',0,16000,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,7500,,'',0,5300,,'',0,15500,,'',0,10800,,'',0
+'2360',2100,82800,,'',0
+'2361',2100,82800,,'',0
+'2363',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9300,,'',0,9800,,'',0,13000,,'',0
+'2358',2201,152300,,'',0
+'2360',2201,90600,,'',0
+'2361',2201,83600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107020 b/src/main/res-next/raw/next_gtfs_schedule_stop_107020
new file mode 100644
index 000000000..aa783fcf7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107020
@@ -0,0 +1,17 @@
+'2357',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
+'2358',601,62200,4,'',0,8900,4,'',0,3100,4,'',0,7700,4,'',0,3500,4,'',0,27500,4,'',0,11600,4,'',0,15500,4,'',0,4700,4,'',0,8600,4,'',0,8200,4,'',0,4000,4,'',0,8500,4,'',0,7800,4,'',0,3800,4,'',0,15500,4,'',0,9800,4,'',0,11500,4,'',0,10900,4,'',0
+'2360',601,92700,4,'',0,8000,4,'',0
+'2361',601,92700,4,'',0,8000,4,'',0
+'2363',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
+'2358',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72500,4,'',0,7800,4,'',0,8500,4,'',0,3500,4,'',0,7500,4,'',0
+'2357',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16600,4,'',0,13200,4,'',0
+'2358',2100,70000,4,'',0,3700,4,'',0,18900,4,'',0,12000,4,'',0,15400,4,'',0,12000,4,'',0,13600,4,'',0,7700,4,'',0,9400,4,'',0,7500,4,'',0,5300,4,'',0,15500,4,'',0,10800,4,'',0
+'2360',2100,82900,4,'',0
+'2361',2100,82900,4,'',0
+'2363',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9300,4,'',0,9800,4,'',0,13000,4,'',0
+'2358',2201,152400,4,'',0
+'2360',2201,90700,4,'',0
+'2361',2201,83700,4,'',0
+'2357',3101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'2358',3101,65000,4,'',0,7100,4,'',0,1400,4,'',0,1600,4,'',0,5400,4,'',0,1800,4,'',0,1500,4,'',0,1600,4,'',0,5700,4,'',0,1700,4,'',0,2900,4,'',0,7200,4,'',0,7300,4,'',0,3700,4,'',0,7400,4,'',0,3700,4,'',0,7300,4,'',0,7700,4,'',0,3300,4,'',0,7900,4,'',0,3700,4,'',0,5600,4,'',0,1800,4,'',0,1200,4,'',0,1700,4,'',0,5300,4,'',0,1800,4,'',0,1700,4,'',0,1400,4,'',0,5400,4,'',0,1400,4,'',0,1500,4,'',0,1800,4,'',0,6900,4,'',0,8500,4,'',0,12300,4,'',0,10700,4,'',0
+'2363',3101,83900,4,'',0,7200,4,'',0,2800,4,'',0,7300,4,'',0,3200,4,'',0,7500,4,'',0,3300,4,'',0,7800,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3700,4,'',0,7300,4,'',0,3600,4,'',0,7300,4,'',0,7600,4,'',0,3300,4,'',0,7700,4,'',0,3200,4,'',0,7600,4,'',0,10500,4,'',0,10500,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107021 b/src/main/res-next/raw/next_gtfs_schedule_stop_107021
new file mode 100644
index 000000000..6f92d0451
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107021
@@ -0,0 +1,20 @@
+'2357',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2357',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2357',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
+'2358',2400,142100,0,'Ctr Loop',0
+'2358',2601,73100,,'',0,68400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107022 b/src/main/res-next/raw/next_gtfs_schedule_stop_107022
new file mode 100644
index 000000000..056ad4a91
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107022
@@ -0,0 +1,20 @@
+'2357',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60300,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'2357',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2357',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
+'2358',2400,142100,0,'Ctr Loop',0
+'2358',2601,73200,,'',0,68400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107023 b/src/main/res-next/raw/next_gtfs_schedule_stop_107023
new file mode 100644
index 000000000..a754d83bc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107023
@@ -0,0 +1,15 @@
+'2357',200,64000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55700,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2700,0,'McMillan',0,9600,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,113900,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2357',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
+'2358',2400,142200,0,'Ctr Loop',0
+'2358',2601,73200,,'',0,68400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107024 b/src/main/res-next/raw/next_gtfs_schedule_stop_107024
new file mode 100644
index 000000000..30f6cce91
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107024
@@ -0,0 +1,15 @@
+'2357',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,114000,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,114000,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2357',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1201,71400,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
+'2358',2400,142200,0,'Ctr Loop',0
+'2358',2601,73300,,'',0,68400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107025 b/src/main/res-next/raw/next_gtfs_schedule_stop_107025
new file mode 100644
index 000000000..3e0c403d5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107025
@@ -0,0 +1,10 @@
+'2357',200,64100,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2600,0,'McMillan',0,9600,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,114000,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114000,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62300,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,73300,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107026 b/src/main/res-next/raw/next_gtfs_schedule_stop_107026
new file mode 100644
index 000000000..16d4b2a37
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107026
@@ -0,0 +1,10 @@
+'2357',200,64200,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55900,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,114100,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114100,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62400,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,73400,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107027 b/src/main/res-next/raw/next_gtfs_schedule_stop_107027
new file mode 100644
index 000000000..ed171f033
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107027
@@ -0,0 +1,10 @@
+'2357',200,64300,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60000,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,114200,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114200,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62500,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,73500,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107030 b/src/main/res-next/raw/next_gtfs_schedule_stop_107030
new file mode 100644
index 000000000..ae088a51b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107030
@@ -0,0 +1,9 @@
+'2357',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60300,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,114500,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,114500,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,54600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,73800,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107031 b/src/main/res-next/raw/next_gtfs_schedule_stop_107031
new file mode 100644
index 000000000..b853debb4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107031
@@ -0,0 +1,9 @@
+'2357',200,64600,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60300,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2200,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62800,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,73800,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107032 b/src/main/res-next/raw/next_gtfs_schedule_stop_107032
new file mode 100644
index 000000000..e87c3e214
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107032
@@ -0,0 +1,9 @@
+'2357',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60400,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114600,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,54700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,73900,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107033 b/src/main/res-next/raw/next_gtfs_schedule_stop_107033
new file mode 100644
index 000000000..c72d4d514
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107033
@@ -0,0 +1,9 @@
+'2357',200,64700,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
+'2358',200,60400,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7400,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,114700,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114700,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62900,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,54800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74000,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107034 b/src/main/res-next/raw/next_gtfs_schedule_stop_107034
new file mode 100644
index 000000000..0a27c93e5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107034
@@ -0,0 +1,9 @@
+'2357',200,64800,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8700,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8100,0,'McMillan',0
+'2358',200,60500,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7400,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,5800,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,114800,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,114800,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,63000,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2700,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,54900,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,74100,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107035 b/src/main/res-next/raw/next_gtfs_schedule_stop_107035
new file mode 100644
index 000000000..4f5862181
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107035
@@ -0,0 +1,9 @@
+'2357',200,65000,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,8700,0,'McMillan',0,4600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,5200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,9000,0,'McMillan',0,4600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60700,0,'McMillan',0,2300,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,6800,0,'McMillan',0,2200,0,'McMillan',0,2100,0,'McMillan',0,5700,0,'McMillan',0,1800,0,'McMillan',0,2100,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2200,0,'McMillan',0,5800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6700,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,5800,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,1500,0,'McMillan',0,7800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0
+'2360',200,115000,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,115000,0,'McMillan',0,18000,0,'McMillan',0,19100,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,63200,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,7300,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3000,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,55000,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74300,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107036 b/src/main/res-next/raw/next_gtfs_schedule_stop_107036
new file mode 100644
index 000000000..413aaf65a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107036
@@ -0,0 +1,4 @@
+'2357',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74400,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107037 b/src/main/res-next/raw/next_gtfs_schedule_stop_107037
new file mode 100644
index 000000000..413aaf65a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107037
@@ -0,0 +1,4 @@
+'2357',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2358',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74400,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107038 b/src/main/res-next/raw/next_gtfs_schedule_stop_107038
new file mode 100644
index 000000000..a6ba605cd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107038
@@ -0,0 +1,4 @@
+'2357',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55100,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,74500,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107039 b/src/main/res-next/raw/next_gtfs_schedule_stop_107039
new file mode 100644
index 000000000..87ca0ded6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107039
@@ -0,0 +1,4 @@
+'2357',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55200,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74500,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107040 b/src/main/res-next/raw/next_gtfs_schedule_stop_107040
new file mode 100644
index 000000000..590e49c19
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107040
@@ -0,0 +1,4 @@
+'2357',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55200,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,74600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107041 b/src/main/res-next/raw/next_gtfs_schedule_stop_107041
new file mode 100644
index 000000000..9a056dafa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107041
@@ -0,0 +1,4 @@
+'2357',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55300,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107042 b/src/main/res-next/raw/next_gtfs_schedule_stop_107042
new file mode 100644
index 000000000..19ade0e6f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107042
@@ -0,0 +1,4 @@
+'2357',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,74700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107043 b/src/main/res-next/raw/next_gtfs_schedule_stop_107043
new file mode 100644
index 000000000..19ade0e6f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107043
@@ -0,0 +1,4 @@
+'2357',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,74700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107044 b/src/main/res-next/raw/next_gtfs_schedule_stop_107044
new file mode 100644
index 000000000..e5538c091
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107044
@@ -0,0 +1,4 @@
+'2357',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55400,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'2358',2601,74700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107045 b/src/main/res-next/raw/next_gtfs_schedule_stop_107045
new file mode 100644
index 000000000..9c25630f8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107045
@@ -0,0 +1,6 @@
+'2357',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55400,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2601,74800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107046 b/src/main/res-next/raw/next_gtfs_schedule_stop_107046
new file mode 100644
index 000000000..bbbc10517
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107046
@@ -0,0 +1,6 @@
+'2357',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2601,74900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107047 b/src/main/res-next/raw/next_gtfs_schedule_stop_107047
new file mode 100644
index 000000000..bbbc10517
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107047
@@ -0,0 +1,6 @@
+'2357',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2601,74900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107048 b/src/main/res-next/raw/next_gtfs_schedule_stop_107048
new file mode 100644
index 000000000..44506f91e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107048
@@ -0,0 +1,4 @@
+'2357',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55600,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107049 b/src/main/res-next/raw/next_gtfs_schedule_stop_107049
new file mode 100644
index 000000000..c8935f3e1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107049
@@ -0,0 +1,4 @@
+'2357',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55600,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107050 b/src/main/res-next/raw/next_gtfs_schedule_stop_107050
new file mode 100644
index 000000000..a5d5bc006
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107050
@@ -0,0 +1,4 @@
+'2357',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55700,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107051 b/src/main/res-next/raw/next_gtfs_schedule_stop_107051
new file mode 100644
index 000000000..d513141d1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107051
@@ -0,0 +1,4 @@
+'2357',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55800,,'',0,10100,,'',0,14300,,'',0,9800,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,14100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107052 b/src/main/res-next/raw/next_gtfs_schedule_stop_107052
new file mode 100644
index 000000000..f2165b4e9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107052
@@ -0,0 +1,4 @@
+'2357',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55900,,'',0,14100,,'',0,10200,,'',0,9900,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,14100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107053 b/src/main/res-next/raw/next_gtfs_schedule_stop_107053
new file mode 100644
index 000000000..d39fe523b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107053
@@ -0,0 +1,7 @@
+'2357',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
+'2357',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',900,55900,4,'',0,14100,4,'',0,10300,4,'',0,9800,4,'',0,5600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,14100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2358',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
+'2363',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107054 b/src/main/res-next/raw/next_gtfs_schedule_stop_107054
new file mode 100644
index 000000000..6baa783ae
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107054
@@ -0,0 +1,4 @@
+'2357',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107055 b/src/main/res-next/raw/next_gtfs_schedule_stop_107055
new file mode 100644
index 000000000..04f5435ce
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107055
@@ -0,0 +1,4 @@
+'2357',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2601,75500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107056 b/src/main/res-next/raw/next_gtfs_schedule_stop_107056
new file mode 100644
index 000000000..7d90e1ad6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107056
@@ -0,0 +1,6 @@
+'2357',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1500,64100,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2358',2601,75600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107057 b/src/main/res-next/raw/next_gtfs_schedule_stop_107057
new file mode 100644
index 000000000..88694abd3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107057
@@ -0,0 +1,6 @@
+'2357',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1500,64200,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2358',2601,75600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107058 b/src/main/res-next/raw/next_gtfs_schedule_stop_107058
new file mode 100644
index 000000000..427638f34
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107058
@@ -0,0 +1,3 @@
+'2357',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107059 b/src/main/res-next/raw/next_gtfs_schedule_stop_107059
new file mode 100644
index 000000000..4cd133e6c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107059
@@ -0,0 +1,3 @@
+'2357',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107060 b/src/main/res-next/raw/next_gtfs_schedule_stop_107060
new file mode 100644
index 000000000..4cd133e6c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107060
@@ -0,0 +1,3 @@
+'2357',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107061 b/src/main/res-next/raw/next_gtfs_schedule_stop_107061
new file mode 100644
index 000000000..d15876578
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107061
@@ -0,0 +1,5 @@
+'2357',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1501,62300,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107062 b/src/main/res-next/raw/next_gtfs_schedule_stop_107062
new file mode 100644
index 000000000..ce2cf7706
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107062
@@ -0,0 +1,2 @@
+'2358',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107063 b/src/main/res-next/raw/next_gtfs_schedule_stop_107063
new file mode 100644
index 000000000..98331e793
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107063
@@ -0,0 +1,4 @@
+'2357',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,145800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107064 b/src/main/res-next/raw/next_gtfs_schedule_stop_107064
new file mode 100644
index 000000000..bf301e5d0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107064
@@ -0,0 +1,4 @@
+'2357',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,145900,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107065 b/src/main/res-next/raw/next_gtfs_schedule_stop_107065
new file mode 100644
index 000000000..3019c2fb9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107065
@@ -0,0 +1,4 @@
+'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,150000,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107066 b/src/main/res-next/raw/next_gtfs_schedule_stop_107066
new file mode 100644
index 000000000..3019c2fb9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107066
@@ -0,0 +1,4 @@
+'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,150000,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107067 b/src/main/res-next/raw/next_gtfs_schedule_stop_107067
new file mode 100644
index 000000000..3019c2fb9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107067
@@ -0,0 +1,4 @@
+'2357',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,150000,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107068 b/src/main/res-next/raw/next_gtfs_schedule_stop_107068
new file mode 100644
index 000000000..5d12c57f1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107068
@@ -0,0 +1,4 @@
+'2357',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81600,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107069 b/src/main/res-next/raw/next_gtfs_schedule_stop_107069
new file mode 100644
index 000000000..5d12c57f1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107069
@@ -0,0 +1,4 @@
+'2357',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81600,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107070 b/src/main/res-next/raw/next_gtfs_schedule_stop_107070
new file mode 100644
index 000000000..76113dbcc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107070
@@ -0,0 +1,9 @@
+'2357',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102500,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102500,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2363',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81700,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107071 b/src/main/res-next/raw/next_gtfs_schedule_stop_107071
new file mode 100644
index 000000000..67f9d8478
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107071
@@ -0,0 +1,9 @@
+'2357',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102500,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102500,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2363',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81700,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107072 b/src/main/res-next/raw/next_gtfs_schedule_stop_107072
new file mode 100644
index 000000000..452ab7c94
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107072
@@ -0,0 +1,9 @@
+'2357',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102700,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
+'2361',201,102700,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
+'2363',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81900,,'',0,68600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107073 b/src/main/res-next/raw/next_gtfs_schedule_stop_107073
new file mode 100644
index 000000000..fbe4071a2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107073
@@ -0,0 +1,9 @@
+'2357',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102700,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102700,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2363',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,81900,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107074 b/src/main/res-next/raw/next_gtfs_schedule_stop_107074
new file mode 100644
index 000000000..df920fcb7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107074
@@ -0,0 +1,9 @@
+'2357',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102800,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102800,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2363',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
+'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82000,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107075 b/src/main/res-next/raw/next_gtfs_schedule_stop_107075
new file mode 100644
index 000000000..c207d2c03
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107075
@@ -0,0 +1,9 @@
+'2357',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,2000,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102800,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,102800,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82000,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107076 b/src/main/res-next/raw/next_gtfs_schedule_stop_107076
new file mode 100644
index 000000000..0d6586d12
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107076
@@ -0,0 +1,9 @@
+'2357',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,8000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102900,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102900,,'',0,17900,,'',0,14000,,'',0,19800,,'',0
+'2363',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82000,,'',0,68800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107077 b/src/main/res-next/raw/next_gtfs_schedule_stop_107077
new file mode 100644
index 000000000..b97a34ea5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107077
@@ -0,0 +1,9 @@
+'2357',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,6000,,'',0,2500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,4900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,103000,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103000,,'',0,17800,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82100,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107078 b/src/main/res-next/raw/next_gtfs_schedule_stop_107078
new file mode 100644
index 000000000..8d9fa393e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107078
@@ -0,0 +1,10 @@
+'2357',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5800,,'',0,1600,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1601,80600,,'',0,11900,,'',0,68500,,'',0,4600,,'',0
+'2358',2600,82100,,'',0,68800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107079 b/src/main/res-next/raw/next_gtfs_schedule_stop_107079
new file mode 100644
index 000000000..fe91c5abe
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107079
@@ -0,0 +1,21 @@
+'2357',100,62600,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54600,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62900,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,52100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'2357',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2358',901,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1500,65000,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'2358',1601,80700,,'',0,11900,,'',0,68400,,'',0,4600,,'',0
+'2358',2600,82200,,'',0,68700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107081 b/src/main/res-next/raw/next_gtfs_schedule_stop_107081
new file mode 100644
index 000000000..d4f54c5af
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107081
@@ -0,0 +1,10 @@
+'2357',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2363',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107082 b/src/main/res-next/raw/next_gtfs_schedule_stop_107082
new file mode 100644
index 000000000..31bf2146e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107082
@@ -0,0 +1,10 @@
+'2357',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1700,,'',0,1100,0,'Bourquin Exch Only',0,1000,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103400,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2363',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107083 b/src/main/res-next/raw/next_gtfs_schedule_stop_107083
new file mode 100644
index 000000000..dd261025f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107083
@@ -0,0 +1,15 @@
+'2357',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1700,,'',0,1100,0,'Bourquin Exch Only',0,5100,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2357',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61900,,'',0,9300,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'2357',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2363',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'2358',1200,73800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
+'2358',2401,81000,0,'Ctr Loop',0
+'2358',2600,82600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107084 b/src/main/res-next/raw/next_gtfs_schedule_stop_107084
new file mode 100644
index 000000000..3c85db96f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107084
@@ -0,0 +1,15 @@
+'2357',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,1000,0,'Bourquin Exch Only',0,5000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103600,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2357',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,62000,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'2357',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2363',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'2358',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15700,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
+'2358',2401,81100,0,'Ctr Loop',0
+'2358',2600,82700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107085 b/src/main/res-next/raw/next_gtfs_schedule_stop_107085
new file mode 100644
index 000000000..239708b9b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107085
@@ -0,0 +1,20 @@
+'2357',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'2357',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,1000,0,'Bourquin Exch Only',0,5000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103700,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103700,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2357',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,62000,,'',0,9300,,'',0,3500,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'2357',701,63900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2363',701,64100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
+'2357',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2363',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'2358',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11900,,'',0,1800,,'',0,8600,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
+'2358',2401,81100,0,'Ctr Loop',0
+'2358',2600,82700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107087 b/src/main/res-next/raw/next_gtfs_schedule_stop_107087
new file mode 100644
index 000000000..1999204d7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107087
@@ -0,0 +1,17 @@
+'2357',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2358',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0
+'2363',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'2357',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,104200,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
+'2361',201,104200,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
+'2363',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',1701,62700,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60100,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,4800,,'',0,8500,,'',0,10300,,'',0,15900,,'',0,11300,,'',0
+'2360',2101,72000,,'',0
+'2361',2101,72000,,'',0
+'2363',2101,73800,,'',0,20000,,'',0,11600,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
+'2358',2201,144500,,'',0
+'2360',2201,83600,,'',0
+'2361',2201,80600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107088 b/src/main/res-next/raw/next_gtfs_schedule_stop_107088
new file mode 100644
index 000000000..d06ab925b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107088
@@ -0,0 +1,17 @@
+'2357',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
+'2357',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,104300,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
+'2361',201,104300,,'',0,17900,,'',0,18000,,'',0,19900,,'',0
+'2363',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',1701,62800,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60200,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11400,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,8800,,'',0,4500,,'',0,10300,,'',0,15900,,'',0,11200,,'',0
+'2360',2101,72000,,'',0
+'2361',2101,72000,,'',0
+'2363',2101,73800,,'',0,20000,,'',0,11700,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
+'2358',2201,144600,,'',0
+'2360',2201,83700,,'',0
+'2361',2201,80700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107089 b/src/main/res-next/raw/next_gtfs_schedule_stop_107089
new file mode 100644
index 000000000..48e863528
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107089
@@ -0,0 +1,17 @@
+'2357',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2358',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0
+'2363',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'2357',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,104300,,'',0,18000,,'',0,18000,,'',0,19900,,'',0
+'2361',201,104300,,'',0,18000,,'',0,18000,,'',0,19900,,'',0
+'2363',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',1701,62800,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60200,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,13000,,'',0,7000,,'',0,8800,,'',0,4500,,'',0,10300,,'',0,15900,,'',0,11200,,'',0
+'2360',2101,72100,,'',0
+'2361',2101,72100,,'',0
+'2363',2101,73900,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
+'2358',2201,144600,,'',0
+'2360',2201,83700,,'',0
+'2361',2201,80700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107090 b/src/main/res-next/raw/next_gtfs_schedule_stop_107090
new file mode 100644
index 000000000..ffe84405b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107090
@@ -0,0 +1,17 @@
+'2357',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2358',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'2357',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,104400,,'',0,17900,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104400,,'',0,17900,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',1701,62900,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60300,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11400,,'',0,15500,,'',0,12900,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
+'2360',2101,72100,,'',0
+'2361',2101,72100,,'',0
+'2363',2101,73900,,'',0,20000,,'',0,11700,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
+'2358',2201,144700,,'',0
+'2360',2201,83800,,'',0
+'2361',2201,80800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107091 b/src/main/res-next/raw/next_gtfs_schedule_stop_107091
new file mode 100644
index 000000000..5c94b312f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107091
@@ -0,0 +1,15 @@
+'2357',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2358',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'2357',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,104500,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104500,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',1701,63000,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15300,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
+'2360',2101,72300,,'',0
+'2361',2101,72300,,'',0
+'2363',2101,74100,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
+'2358',2401,75900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107092 b/src/main/res-next/raw/next_gtfs_schedule_stop_107092
new file mode 100644
index 000000000..47751232c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107092
@@ -0,0 +1,8 @@
+'2357',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'2357',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,104600,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104600,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107093 b/src/main/res-next/raw/next_gtfs_schedule_stop_107093
new file mode 100644
index 000000000..7db3f69be
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107093
@@ -0,0 +1,8 @@
+'2357',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'2357',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9300,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,104700,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104700,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107094 b/src/main/res-next/raw/next_gtfs_schedule_stop_107094
new file mode 100644
index 000000000..2f517e491
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107094
@@ -0,0 +1,11 @@
+'2357',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,104800,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104800,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2358',2201,151200,,'',0
+'2360',2201,85800,,'',0
+'2361',2201,82800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107095 b/src/main/res-next/raw/next_gtfs_schedule_stop_107095
new file mode 100644
index 000000000..2947933ed
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107095
@@ -0,0 +1,8 @@
+'2357',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,104900,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,104900,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',2201,151300,,'',0
+'2360',2201,85800,,'',0
+'2361',2201,82800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107096 b/src/main/res-next/raw/next_gtfs_schedule_stop_107096
new file mode 100644
index 000000000..69c9b2150
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107096
@@ -0,0 +1,8 @@
+'2357',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9400,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105000,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,105000,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',2201,151400,,'',0
+'2360',2201,85900,,'',0
+'2361',2201,82900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107097 b/src/main/res-next/raw/next_gtfs_schedule_stop_107097
new file mode 100644
index 000000000..b976bfe32
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107097
@@ -0,0 +1,8 @@
+'2357',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9500,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105100,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2361',201,105100,,'',0,18000,,'',0,18100,,'',0,19900,,'',0
+'2363',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2358',2201,145400,,'',0
+'2360',2201,84300,,'',0
+'2361',2201,81300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107098 b/src/main/res-next/raw/next_gtfs_schedule_stop_107098
new file mode 100644
index 000000000..25ec149ca
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107098
@@ -0,0 +1,5 @@
+'2357',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,53900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105200,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105200,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107099 b/src/main/res-next/raw/next_gtfs_schedule_stop_107099
new file mode 100644
index 000000000..a53583121
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107099
@@ -0,0 +1,5 @@
+'2357',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,54100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105400,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105400,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107100 b/src/main/res-next/raw/next_gtfs_schedule_stop_107100
new file mode 100644
index 000000000..4abc69433
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107100
@@ -0,0 +1,5 @@
+'2357',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105500,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105500,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107101 b/src/main/res-next/raw/next_gtfs_schedule_stop_107101
new file mode 100644
index 000000000..22215df14
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107101
@@ -0,0 +1,5 @@
+'2357',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105600,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105600,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107102 b/src/main/res-next/raw/next_gtfs_schedule_stop_107102
new file mode 100644
index 000000000..1d7f57d30
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107102
@@ -0,0 +1,5 @@
+'2357',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105600,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,105600,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107107 b/src/main/res-next/raw/next_gtfs_schedule_stop_107107
new file mode 100644
index 000000000..3002f2263
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107107
@@ -0,0 +1,8 @@
+'2357',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
+'2357',200,61800,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
+'2358',200,53600,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111100,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
+'2361',200,111100,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
+'2363',200,60100,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107108 b/src/main/res-next/raw/next_gtfs_schedule_stop_107108
new file mode 100644
index 000000000..6ca0243dd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107108
@@ -0,0 +1,3 @@
+'2357',100,60600,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52500,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,60800,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107109 b/src/main/res-next/raw/next_gtfs_schedule_stop_107109
new file mode 100644
index 000000000..8e9ddcd0e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107109
@@ -0,0 +1,3 @@
+'2357',100,60700,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52600,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,60900,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107110 b/src/main/res-next/raw/next_gtfs_schedule_stop_107110
new file mode 100644
index 000000000..8351ded02
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107110
@@ -0,0 +1,8 @@
+'2357',100,60700,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52600,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,60900,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2357',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
+'2358',200,53700,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111200,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
+'2361',200,111200,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
+'2363',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107111 b/src/main/res-next/raw/next_gtfs_schedule_stop_107111
new file mode 100644
index 000000000..36028ba3c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107111
@@ -0,0 +1,8 @@
+'2357',100,60800,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52700,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61000,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
+'2357',200,61900,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,53700,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111300,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
+'2361',200,111300,0,'McMillan',0,14000,0,'McMillan',0,18400,0,'McMillan',0,19800,0,'McMillan',0
+'2363',200,60200,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107112 b/src/main/res-next/raw/next_gtfs_schedule_stop_107112
new file mode 100644
index 000000000..29eef6a5f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107112
@@ -0,0 +1,3 @@
+'2357',100,60900,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52800,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61100,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107113 b/src/main/res-next/raw/next_gtfs_schedule_stop_107113
new file mode 100644
index 000000000..64350720a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107113
@@ -0,0 +1,3 @@
+'2357',100,61000,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,52900,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61200,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107115 b/src/main/res-next/raw/next_gtfs_schedule_stop_107115
new file mode 100644
index 000000000..3535d43d0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107115
@@ -0,0 +1,3 @@
+'2357',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107116 b/src/main/res-next/raw/next_gtfs_schedule_stop_107116
new file mode 100644
index 000000000..174da370a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107116
@@ -0,0 +1,6 @@
+'2357',100,61200,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53100,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61400,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2358',2201,150800,,'',0
+'2360',2201,85400,,'',0
+'2361',2201,82400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107117 b/src/main/res-next/raw/next_gtfs_schedule_stop_107117
new file mode 100644
index 000000000..ababf5972
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107117
@@ -0,0 +1,6 @@
+'2357',100,61300,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53200,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61500,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2358',2201,150900,,'',0
+'2360',2201,85500,,'',0
+'2361',2201,82500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107118 b/src/main/res-next/raw/next_gtfs_schedule_stop_107118
new file mode 100644
index 000000000..dab6701bf
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107118
@@ -0,0 +1,6 @@
+'2357',100,61300,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53300,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61600,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2358',2201,151000,,'',0
+'2360',2201,85600,,'',0
+'2361',2201,82600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107119 b/src/main/res-next/raw/next_gtfs_schedule_stop_107119
new file mode 100644
index 000000000..c8ea82025
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107119
@@ -0,0 +1,6 @@
+'2357',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
+'2358',2201,151100,,'',0
+'2360',2201,85700,,'',0
+'2361',2201,82700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107120 b/src/main/res-next/raw/next_gtfs_schedule_stop_107120
new file mode 100644
index 000000000..d93aa2f93
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107120
@@ -0,0 +1,3 @@
+'2357',100,61400,0,'UFV',0,3800,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4600,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,5100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53400,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61700,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,7300,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107121 b/src/main/res-next/raw/next_gtfs_schedule_stop_107121
new file mode 100644
index 000000000..3723a77bb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107121
@@ -0,0 +1,6 @@
+'2357',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2358',301,60700,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2358',500,61100,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107122 b/src/main/res-next/raw/next_gtfs_schedule_stop_107122
new file mode 100644
index 000000000..aee951872
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107122
@@ -0,0 +1,15 @@
+'2357',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2357',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2358',301,60000,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2363',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2357',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55600,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85600,,'',0,8000,,'',0
+'2361',601,85600,,'',0,8000,,'',0
+'2363',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74000,0,'Ctr Loop',0
+'2357',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'2363',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107123 b/src/main/res-next/raw/next_gtfs_schedule_stop_107123
new file mode 100644
index 000000000..f5b3d98e3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107123
@@ -0,0 +1,15 @@
+'2357',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2357',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2358',301,60000,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2363',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55600,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85700,,'',0,8000,,'',0
+'2361',601,85700,,'',0,8000,,'',0
+'2363',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74100,0,'Ctr Loop',0
+'2357',3100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,55900,,'',0,7100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'2363',3100,84600,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107124 b/src/main/res-next/raw/next_gtfs_schedule_stop_107124
new file mode 100644
index 000000000..1134bcd04
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107124
@@ -0,0 +1,12 @@
+'2357',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55700,,'',0,8500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85700,,'',0,8000,,'',0
+'2361',601,85700,,'',0,8000,,'',0
+'2363',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74100,0,'Ctr Loop',0
+'2357',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107125 b/src/main/res-next/raw/next_gtfs_schedule_stop_107125
new file mode 100644
index 000000000..c6d1269b4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107125
@@ -0,0 +1,12 @@
+'2357',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55700,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85800,,'',0,8000,,'',0
+'2361',601,85800,,'',0,8000,,'',0
+'2363',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74200,0,'Ctr Loop',0
+'2357',3100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60000,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'2363',3100,84700,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107126 b/src/main/res-next/raw/next_gtfs_schedule_stop_107126
new file mode 100644
index 000000000..4c8d58511
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107126
@@ -0,0 +1,12 @@
+'2357',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55700,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85800,,'',0,8000,,'',0
+'2361',601,85800,,'',0,8000,,'',0
+'2363',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74200,0,'Ctr Loop',0
+'2357',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107127 b/src/main/res-next/raw/next_gtfs_schedule_stop_107127
new file mode 100644
index 000000000..305147565
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107127
@@ -0,0 +1,6 @@
+'2357',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',3100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60100,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'2363',3100,84800,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107128 b/src/main/res-next/raw/next_gtfs_schedule_stop_107128
new file mode 100644
index 000000000..16a7c30fb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107128
@@ -0,0 +1,6 @@
+'2357',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',3100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60200,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,84900,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107129 b/src/main/res-next/raw/next_gtfs_schedule_stop_107129
new file mode 100644
index 000000000..1e0195ee4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107129
@@ -0,0 +1,6 @@
+'2357',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107130 b/src/main/res-next/raw/next_gtfs_schedule_stop_107130
new file mode 100644
index 000000000..80ff44fc7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107130
@@ -0,0 +1,6 @@
+'2357',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54900,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107131 b/src/main/res-next/raw/next_gtfs_schedule_stop_107131
new file mode 100644
index 000000000..e763c77b2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107131
@@ -0,0 +1,6 @@
+'2357',100,62900,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
+'2358',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63200,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
+'2357',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107132 b/src/main/res-next/raw/next_gtfs_schedule_stop_107132
new file mode 100644
index 000000000..1bc17da88
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107132
@@ -0,0 +1,6 @@
+'2357',100,63000,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,55000,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63300,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107133 b/src/main/res-next/raw/next_gtfs_schedule_stop_107133
new file mode 100644
index 000000000..0e34467d0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107133
@@ -0,0 +1,3 @@
+'2357',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107134 b/src/main/res-next/raw/next_gtfs_schedule_stop_107134
new file mode 100644
index 000000000..39a836771
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107134
@@ -0,0 +1,3 @@
+'2357',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107135 b/src/main/res-next/raw/next_gtfs_schedule_stop_107135
new file mode 100644
index 000000000..1f8c7e481
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107135
@@ -0,0 +1,3 @@
+'2357',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107136 b/src/main/res-next/raw/next_gtfs_schedule_stop_107136
new file mode 100644
index 000000000..1019f218d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107136
@@ -0,0 +1,7 @@
+'2357',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
+'2357',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107137 b/src/main/res-next/raw/next_gtfs_schedule_stop_107137
new file mode 100644
index 000000000..26fae26b1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107137
@@ -0,0 +1,7 @@
+'2357',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',700,60900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,5900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,62200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,60900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107138 b/src/main/res-next/raw/next_gtfs_schedule_stop_107138
new file mode 100644
index 000000000..deb3fde2f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107138
@@ -0,0 +1,3 @@
+'2357',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,61000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107139 b/src/main/res-next/raw/next_gtfs_schedule_stop_107139
new file mode 100644
index 000000000..7923ab33e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107139
@@ -0,0 +1,3 @@
+'2357',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,61100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107140 b/src/main/res-next/raw/next_gtfs_schedule_stop_107140
new file mode 100644
index 000000000..773dd7d30
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107140
@@ -0,0 +1,6 @@
+'2357',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
+'2357',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',300,62500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3800,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3300,4,'',0,7700,4,'',0,2800,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
+'2358',301,54000,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9000,0,'Montrose Exch Only',0
+'2363',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
+'2363',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107142 b/src/main/res-next/raw/next_gtfs_schedule_stop_107142
new file mode 100644
index 000000000..0bfc5cf82
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107142
@@ -0,0 +1,3 @@
+'2357',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2358',300,61500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107143 b/src/main/res-next/raw/next_gtfs_schedule_stop_107143
new file mode 100644
index 000000000..92d9bb462
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107143
@@ -0,0 +1,3 @@
+'2357',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2358',300,61700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
+'2363',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107146 b/src/main/res-next/raw/next_gtfs_schedule_stop_107146
new file mode 100644
index 000000000..6680041bb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107146
@@ -0,0 +1,3 @@
+'2357',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2358',300,61300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107147 b/src/main/res-next/raw/next_gtfs_schedule_stop_107147
new file mode 100644
index 000000000..8a4fc3e76
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107147
@@ -0,0 +1,3 @@
+'2357',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54200,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107148 b/src/main/res-next/raw/next_gtfs_schedule_stop_107148
new file mode 100644
index 000000000..fa0d2175a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107148
@@ -0,0 +1,3 @@
+'2357',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54300,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107149 b/src/main/res-next/raw/next_gtfs_schedule_stop_107149
new file mode 100644
index 000000000..84dc3766a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107149
@@ -0,0 +1,6 @@
+'2357',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54400,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'2357',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64400,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'2363',701,63100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107150 b/src/main/res-next/raw/next_gtfs_schedule_stop_107150
new file mode 100644
index 000000000..2a494562e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107150
@@ -0,0 +1,6 @@
+'2357',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54500,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'2357',701,62900,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64500,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'2363',701,63100,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107151 b/src/main/res-next/raw/next_gtfs_schedule_stop_107151
new file mode 100644
index 000000000..cf4df85e6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107151
@@ -0,0 +1,3 @@
+'2357',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54500,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107153 b/src/main/res-next/raw/next_gtfs_schedule_stop_107153
new file mode 100644
index 000000000..f29375e7f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107153
@@ -0,0 +1,3 @@
+'2357',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54700,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107154 b/src/main/res-next/raw/next_gtfs_schedule_stop_107154
new file mode 100644
index 000000000..4259043b4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107154
@@ -0,0 +1,6 @@
+'2357',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'2357',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54700,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107155 b/src/main/res-next/raw/next_gtfs_schedule_stop_107155
new file mode 100644
index 000000000..1318c3027
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107155
@@ -0,0 +1,6 @@
+'2357',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'2357',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54800,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107156 b/src/main/res-next/raw/next_gtfs_schedule_stop_107156
new file mode 100644
index 000000000..054691bfb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107156
@@ -0,0 +1,6 @@
+'2357',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'2357',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54800,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107157 b/src/main/res-next/raw/next_gtfs_schedule_stop_107157
new file mode 100644
index 000000000..0081a1a43
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107157
@@ -0,0 +1,6 @@
+'2357',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2357',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107158 b/src/main/res-next/raw/next_gtfs_schedule_stop_107158
new file mode 100644
index 000000000..89beb1f64
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107158
@@ -0,0 +1,8 @@
+'2357',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55100,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'2357',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107159 b/src/main/res-next/raw/next_gtfs_schedule_stop_107159
new file mode 100644
index 000000000..6dd003880
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107159
@@ -0,0 +1,6 @@
+'2357',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2357',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107160 b/src/main/res-next/raw/next_gtfs_schedule_stop_107160
new file mode 100644
index 000000000..e48c6861e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107160
@@ -0,0 +1,6 @@
+'2357',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'2357',3101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64600,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83500,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107161 b/src/main/res-next/raw/next_gtfs_schedule_stop_107161
new file mode 100644
index 000000000..d3c566841
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107161
@@ -0,0 +1,6 @@
+'2357',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2357',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107162 b/src/main/res-next/raw/next_gtfs_schedule_stop_107162
new file mode 100644
index 000000000..ab5bab6e8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107162
@@ -0,0 +1,7 @@
+'2357',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'2358',2400,145500,0,'Ctr Loop',0
+'2357',3101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64700,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83600,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107163 b/src/main/res-next/raw/next_gtfs_schedule_stop_107163
new file mode 100644
index 000000000..06dca3330
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107163
@@ -0,0 +1,7 @@
+'2357',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55400,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2358',2400,145600,0,'Ctr Loop',0
+'2357',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107164 b/src/main/res-next/raw/next_gtfs_schedule_stop_107164
new file mode 100644
index 000000000..ddf52c32c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107164
@@ -0,0 +1,7 @@
+'2357',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2358',2400,145700,0,'Ctr Loop',0
+'2357',3101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64800,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83700,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107165 b/src/main/res-next/raw/next_gtfs_schedule_stop_107165
new file mode 100644
index 000000000..a41de5007
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107165
@@ -0,0 +1,10 @@
+'2357',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2357',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',300,55000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2358',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2363',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'2358',2400,145700,0,'Ctr Loop',0
+'2357',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107166 b/src/main/res-next/raw/next_gtfs_schedule_stop_107166
new file mode 100644
index 000000000..539b82353
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107166
@@ -0,0 +1,10 @@
+'2357',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2357',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',300,55000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2358',301,55600,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2363',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2358',2400,145800,0,'Ctr Loop',0
+'2357',3101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64900,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,7300,,'',0,3700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7900,,'',0,3700,,'',0,5600,,'',0,1800,,'',0,1200,,'',0,1700,,'',0,5300,,'',0,1800,,'',0,1700,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83800,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3200,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7600,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107167 b/src/main/res-next/raw/next_gtfs_schedule_stop_107167
new file mode 100644
index 000000000..5947b2371
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107167
@@ -0,0 +1,3 @@
+'2357',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107168 b/src/main/res-next/raw/next_gtfs_schedule_stop_107168
new file mode 100644
index 000000000..e9910cba7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107168
@@ -0,0 +1,3 @@
+'2357',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107169 b/src/main/res-next/raw/next_gtfs_schedule_stop_107169
new file mode 100644
index 000000000..e9910cba7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107169
@@ -0,0 +1,3 @@
+'2357',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107170 b/src/main/res-next/raw/next_gtfs_schedule_stop_107170
new file mode 100644
index 000000000..07b5b512c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107170
@@ -0,0 +1,3 @@
+'2357',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107171 b/src/main/res-next/raw/next_gtfs_schedule_stop_107171
new file mode 100644
index 000000000..c8cb0709f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107171
@@ -0,0 +1,3 @@
+'2357',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,4800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107172 b/src/main/res-next/raw/next_gtfs_schedule_stop_107172
new file mode 100644
index 000000000..5774cc769
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107172
@@ -0,0 +1,3 @@
+'2357',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107175 b/src/main/res-next/raw/next_gtfs_schedule_stop_107175
new file mode 100644
index 000000000..b00e35f23
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107175
@@ -0,0 +1,13 @@
+'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2358',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'2358',1700,64800,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65300,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9400,,'',0,15600,,'',0,11000,,'',0
+'2360',2100,82100,,'',0
+'2361',2100,82100,,'',0
+'2363',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143100,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107176 b/src/main/res-next/raw/next_gtfs_schedule_stop_107176
new file mode 100644
index 000000000..19dd81d71
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107176
@@ -0,0 +1,13 @@
+'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2358',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'2358',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4300,,'',0,7700,,'',0,7600,,'',0
+'2357',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65400,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9400,,'',0,15600,,'',0,10900,,'',0
+'2360',2100,82200,,'',0
+'2361',2100,82200,,'',0
+'2363',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143100,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107177 b/src/main/res-next/raw/next_gtfs_schedule_stop_107177
new file mode 100644
index 000000000..97e702e55
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107177
@@ -0,0 +1,13 @@
+'2357',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61100,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'2358',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65400,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13600,,'',0,7700,,'',0,9400,,'',0,3500,,'',0,9300,,'',0,15600,,'',0,11000,,'',0
+'2360',2100,82200,,'',0
+'2361',2100,82200,,'',0
+'2363',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
+'2358',2400,143200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107178 b/src/main/res-next/raw/next_gtfs_schedule_stop_107178
new file mode 100644
index 000000000..0c4486755
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107178
@@ -0,0 +1,3 @@
+'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107179 b/src/main/res-next/raw/next_gtfs_schedule_stop_107179
new file mode 100644
index 000000000..8b906816d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107179
@@ -0,0 +1,3 @@
+'2357',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54600,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107180 b/src/main/res-next/raw/next_gtfs_schedule_stop_107180
new file mode 100644
index 000000000..2f2832738
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107180
@@ -0,0 +1,3 @@
+'2357',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107181 b/src/main/res-next/raw/next_gtfs_schedule_stop_107181
new file mode 100644
index 000000000..459a64d78
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107181
@@ -0,0 +1,3 @@
+'2357',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54700,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107182 b/src/main/res-next/raw/next_gtfs_schedule_stop_107182
new file mode 100644
index 000000000..52e7ad36b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107182
@@ -0,0 +1,3 @@
+'2357',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54800,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107183 b/src/main/res-next/raw/next_gtfs_schedule_stop_107183
new file mode 100644
index 000000000..c01863b70
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107183
@@ -0,0 +1,3 @@
+'2357',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107184 b/src/main/res-next/raw/next_gtfs_schedule_stop_107184
new file mode 100644
index 000000000..eb4c63d63
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107184
@@ -0,0 +1,3 @@
+'2357',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107185 b/src/main/res-next/raw/next_gtfs_schedule_stop_107185
new file mode 100644
index 000000000..76c1a248c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107185
@@ -0,0 +1,3 @@
+'2357',100,63100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,55100,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63400,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107186 b/src/main/res-next/raw/next_gtfs_schedule_stop_107186
new file mode 100644
index 000000000..386d51fe7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107186
@@ -0,0 +1,4 @@
+'2357',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
+'2358',100,55300,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63500,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0
+'2358',1201,71900,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107187 b/src/main/res-next/raw/next_gtfs_schedule_stop_107187
new file mode 100644
index 000000000..479ec24d5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107187
@@ -0,0 +1,4 @@
+'2357',100,63200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
+'2358',100,55300,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63500,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
+'2358',1201,71900,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107188 b/src/main/res-next/raw/next_gtfs_schedule_stop_107188
new file mode 100644
index 000000000..c376ba17d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107188
@@ -0,0 +1,4 @@
+'2357',100,63300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
+'2358',100,55400,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63600,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
+'2358',1201,72000,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107189 b/src/main/res-next/raw/next_gtfs_schedule_stop_107189
new file mode 100644
index 000000000..b4cc55ecc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107189
@@ -0,0 +1,4 @@
+'2357',100,63400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8800,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9200,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9800,0,'UFV',0
+'2358',100,55500,0,'UFV',0,8200,0,'UFV',0,7100,0,'UFV',0,3200,0,'UFV',0,6200,0,'UFV',0,2100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,6000,0,'UFV',0,1500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0,6700,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1700,0,'UFV',0,1800,0,'UFV',0,5700,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,6900,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63700,0,'UFV',0,7100,0,'UFV',0,4000,0,'UFV',0,8700,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2400,0,'UFV',0
+'2358',1201,72100,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107190 b/src/main/res-next/raw/next_gtfs_schedule_stop_107190
new file mode 100644
index 000000000..b0ae58f2a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107190
@@ -0,0 +1,8 @@
+'2357',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
+'2357',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',100,55600,4,'',0,8200,4,'',0,7100,4,'',0,3200,4,'',0,6200,4,'',0,2100,4,'',0,800,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,6100,4,'',0,1500,4,'',0,800,4,'',0,2000,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,1500,4,'',0,1000,4,'',0,6600,4,'',0,2600,4,'',0,6700,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2500,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
+'2358',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
+'2363',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,72400,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
+'2358',1201,72200,4,'',0,3500,4,'',0,8000,4,'',0,7800,4,'',0,3800,4,'',0,7300,4,'',0,11700,4,'',0,11600,4,'',0,15600,4,'',0,13900,4,'',0,7200,4,'',0,8000,4,'',0,3200,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107191 b/src/main/res-next/raw/next_gtfs_schedule_stop_107191
new file mode 100644
index 000000000..eccd7fae7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107191
@@ -0,0 +1,5 @@
+'2357',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'2357',701,63800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2363',701,64000,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,14800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107192 b/src/main/res-next/raw/next_gtfs_schedule_stop_107192
new file mode 100644
index 000000000..b7c4fe4b3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107192
@@ -0,0 +1,5 @@
+'2357',100,62300,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5900,0,'UFV',0
+'2358',100,54300,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62600,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',700,60200,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60200,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107193 b/src/main/res-next/raw/next_gtfs_schedule_stop_107193
new file mode 100644
index 000000000..e9a593522
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107193
@@ -0,0 +1,5 @@
+'2357',100,62400,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54400,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2700,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62700,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',700,60300,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60300,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107194 b/src/main/res-next/raw/next_gtfs_schedule_stop_107194
new file mode 100644
index 000000000..c91cd277f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107194
@@ -0,0 +1,5 @@
+'2357',100,62500,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54500,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62800,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',700,60400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60400,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107195 b/src/main/res-next/raw/next_gtfs_schedule_stop_107195
new file mode 100644
index 000000000..4e94d291b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107195
@@ -0,0 +1,4 @@
+'2357',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,72500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107196 b/src/main/res-next/raw/next_gtfs_schedule_stop_107196
new file mode 100644
index 000000000..1e717cfac
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107196
@@ -0,0 +1,4 @@
+'2357',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107197 b/src/main/res-next/raw/next_gtfs_schedule_stop_107197
new file mode 100644
index 000000000..dbfd20840
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107197
@@ -0,0 +1,4 @@
+'2357',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107198 b/src/main/res-next/raw/next_gtfs_schedule_stop_107198
new file mode 100644
index 000000000..efd0347e0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107198
@@ -0,0 +1,4 @@
+'2357',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,73400,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107199 b/src/main/res-next/raw/next_gtfs_schedule_stop_107199
new file mode 100644
index 000000000..a73122c8b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107199
@@ -0,0 +1,5 @@
+'2357',100,62200,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54200,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62500,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',700,60100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107200 b/src/main/res-next/raw/next_gtfs_schedule_stop_107200
new file mode 100644
index 000000000..dcf23b272
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107200
@@ -0,0 +1,3 @@
+'2357',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107201 b/src/main/res-next/raw/next_gtfs_schedule_stop_107201
new file mode 100644
index 000000000..1a95683ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107201
@@ -0,0 +1,5 @@
+'2357',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'2357',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2363',701,63800,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107202 b/src/main/res-next/raw/next_gtfs_schedule_stop_107202
new file mode 100644
index 000000000..8b823f413
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107202
@@ -0,0 +1,5 @@
+'2357',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'2357',701,63600,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2363',701,63800,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107203 b/src/main/res-next/raw/next_gtfs_schedule_stop_107203
new file mode 100644
index 000000000..129659496
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107203
@@ -0,0 +1,5 @@
+'2357',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'2357',701,63700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2363',701,63900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,14200,,'',0,10600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107204 b/src/main/res-next/raw/next_gtfs_schedule_stop_107204
new file mode 100644
index 000000000..4fb262a35
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107204
@@ -0,0 +1,3 @@
+'2357',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60100,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107205 b/src/main/res-next/raw/next_gtfs_schedule_stop_107205
new file mode 100644
index 000000000..a165f6c55
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107205
@@ -0,0 +1,3 @@
+'2357',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60200,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107206 b/src/main/res-next/raw/next_gtfs_schedule_stop_107206
new file mode 100644
index 000000000..1c3fe94d7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107206
@@ -0,0 +1,3 @@
+'2357',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60200,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107207 b/src/main/res-next/raw/next_gtfs_schedule_stop_107207
new file mode 100644
index 000000000..3a9845bd8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107207
@@ -0,0 +1,3 @@
+'2357',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60300,,'',0,5200,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107208 b/src/main/res-next/raw/next_gtfs_schedule_stop_107208
new file mode 100644
index 000000000..f7c5f186b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107208
@@ -0,0 +1,8 @@
+'2357',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60300,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91400,,'',0,4000,,'',0
+'2361',601,91400,,'',0,4000,,'',0
+'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107209 b/src/main/res-next/raw/next_gtfs_schedule_stop_107209
new file mode 100644
index 000000000..dd79e34d5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107209
@@ -0,0 +1,8 @@
+'2357',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60400,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,61100,,'',0,4800,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91500,,'',0,4000,,'',0
+'2361',601,91500,,'',0,4000,,'',0
+'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107210 b/src/main/res-next/raw/next_gtfs_schedule_stop_107210
new file mode 100644
index 000000000..2eace32e3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107210
@@ -0,0 +1,8 @@
+'2357',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60500,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,61200,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91600,,'',0,4000,,'',0
+'2361',601,91600,,'',0,4000,,'',0
+'2363',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107211 b/src/main/res-next/raw/next_gtfs_schedule_stop_107211
new file mode 100644
index 000000000..96cd417b6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107211
@@ -0,0 +1,3 @@
+'2357',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',300,54400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107213 b/src/main/res-next/raw/next_gtfs_schedule_stop_107213
new file mode 100644
index 000000000..d2b336eff
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107213
@@ -0,0 +1,7 @@
+'2357',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2358',301,60800,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,61100,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2358',2400,142900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107214 b/src/main/res-next/raw/next_gtfs_schedule_stop_107214
new file mode 100644
index 000000000..7bab70a7e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107214
@@ -0,0 +1,13 @@
+'2357',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2357',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
+'2358',300,54200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2358',301,60900,4,'',0,9300,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7500,4,'',0,7600,4,'',0,3600,4,'',0,7600,4,'',0,3600,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,2900,4,'',0,7300,4,'',0,3500,4,'',0,6700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
+'2363',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2363',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
+'2357',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2357',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2358',500,60900,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2358',501,61200,4,'',0,2900,4,'',0,6800,4,'',0,2800,4,'',0,7600,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7800,4,'',0,3100,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
+'2363',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'2363',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
+'2358',2400,143000,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107215 b/src/main/res-next/raw/next_gtfs_schedule_stop_107215
new file mode 100644
index 000000000..43068dba9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107215
@@ -0,0 +1,8 @@
+'2357',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2357',3100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60300,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85000,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107216 b/src/main/res-next/raw/next_gtfs_schedule_stop_107216
new file mode 100644
index 000000000..ee5c5a9ba
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107216
@@ -0,0 +1,5 @@
+'2357',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60700,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61700,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107217 b/src/main/res-next/raw/next_gtfs_schedule_stop_107217
new file mode 100644
index 000000000..e0e209d67
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107217
@@ -0,0 +1,5 @@
+'2357',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60800,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61800,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107218 b/src/main/res-next/raw/next_gtfs_schedule_stop_107218
new file mode 100644
index 000000000..4590cb3ac
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107218
@@ -0,0 +1,5 @@
+'2357',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60800,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61800,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107219 b/src/main/res-next/raw/next_gtfs_schedule_stop_107219
new file mode 100644
index 000000000..49b0198e7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107219
@@ -0,0 +1,5 @@
+'2357',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60900,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61800,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107220 b/src/main/res-next/raw/next_gtfs_schedule_stop_107220
new file mode 100644
index 000000000..09f11081c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107220
@@ -0,0 +1,5 @@
+'2357',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,60900,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61900,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107221 b/src/main/res-next/raw/next_gtfs_schedule_stop_107221
new file mode 100644
index 000000000..8a94a1bd7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107221
@@ -0,0 +1,5 @@
+'2357',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61000,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1501,61900,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
+'2363',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107222 b/src/main/res-next/raw/next_gtfs_schedule_stop_107222
new file mode 100644
index 000000000..1fa0b3f91
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107222
@@ -0,0 +1,4 @@
+'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,75900,,'',0,67500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107223 b/src/main/res-next/raw/next_gtfs_schedule_stop_107223
new file mode 100644
index 000000000..da4c54fd1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107223
@@ -0,0 +1,4 @@
+'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,80000,,'',0,63500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107224 b/src/main/res-next/raw/next_gtfs_schedule_stop_107224
new file mode 100644
index 000000000..a3c5cfe12
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107224
@@ -0,0 +1,3 @@
+'2357',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107225 b/src/main/res-next/raw/next_gtfs_schedule_stop_107225
new file mode 100644
index 000000000..b4867812c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107225
@@ -0,0 +1,3 @@
+'2357',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61200,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107226 b/src/main/res-next/raw/next_gtfs_schedule_stop_107226
new file mode 100644
index 000000000..e29f66050
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107226
@@ -0,0 +1,3 @@
+'2357',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107227 b/src/main/res-next/raw/next_gtfs_schedule_stop_107227
new file mode 100644
index 000000000..1c1847102
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107227
@@ -0,0 +1,3 @@
+'2357',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107228 b/src/main/res-next/raw/next_gtfs_schedule_stop_107228
new file mode 100644
index 000000000..4f95731f2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107228
@@ -0,0 +1,4 @@
+'2357',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61400,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2601,80300,,'',0,63600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107229 b/src/main/res-next/raw/next_gtfs_schedule_stop_107229
new file mode 100644
index 000000000..2f166a259
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107229
@@ -0,0 +1,3 @@
+'2357',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107230 b/src/main/res-next/raw/next_gtfs_schedule_stop_107230
new file mode 100644
index 000000000..af1fc3e1f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107230
@@ -0,0 +1,3 @@
+'2357',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107231 b/src/main/res-next/raw/next_gtfs_schedule_stop_107231
new file mode 100644
index 000000000..ead0db76f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107231
@@ -0,0 +1,3 @@
+'2357',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2300,,'',0,7700,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107232 b/src/main/res-next/raw/next_gtfs_schedule_stop_107232
new file mode 100644
index 000000000..65d26c593
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107232
@@ -0,0 +1,3 @@
+'2357',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,2400,,'',0,7600,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'2363',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107234 b/src/main/res-next/raw/next_gtfs_schedule_stop_107234
new file mode 100644
index 000000000..ddb5300ca
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107234
@@ -0,0 +1,3 @@
+'2357',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107235 b/src/main/res-next/raw/next_gtfs_schedule_stop_107235
new file mode 100644
index 000000000..96280089e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107235
@@ -0,0 +1,3 @@
+'2357',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107236 b/src/main/res-next/raw/next_gtfs_schedule_stop_107236
new file mode 100644
index 000000000..e8b764db6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107236
@@ -0,0 +1,3 @@
+'2357',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107237 b/src/main/res-next/raw/next_gtfs_schedule_stop_107237
new file mode 100644
index 000000000..d710341f0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107237
@@ -0,0 +1,3 @@
+'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107238 b/src/main/res-next/raw/next_gtfs_schedule_stop_107238
new file mode 100644
index 000000000..c1fdf1ac1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107238
@@ -0,0 +1,3 @@
+'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107239 b/src/main/res-next/raw/next_gtfs_schedule_stop_107239
new file mode 100644
index 000000000..c1fdf1ac1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107239
@@ -0,0 +1,3 @@
+'2357',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107240 b/src/main/res-next/raw/next_gtfs_schedule_stop_107240
new file mode 100644
index 000000000..b08552d6b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107240
@@ -0,0 +1,3 @@
+'2357',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107241 b/src/main/res-next/raw/next_gtfs_schedule_stop_107241
new file mode 100644
index 000000000..541691810
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107241
@@ -0,0 +1,3 @@
+'2357',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107242 b/src/main/res-next/raw/next_gtfs_schedule_stop_107242
new file mode 100644
index 000000000..4b645228f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107242
@@ -0,0 +1,3 @@
+'2357',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107243 b/src/main/res-next/raw/next_gtfs_schedule_stop_107243
new file mode 100644
index 000000000..4b645228f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107243
@@ -0,0 +1,3 @@
+'2357',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107244 b/src/main/res-next/raw/next_gtfs_schedule_stop_107244
new file mode 100644
index 000000000..99719ee60
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107244
@@ -0,0 +1,3 @@
+'2357',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107245 b/src/main/res-next/raw/next_gtfs_schedule_stop_107245
new file mode 100644
index 000000000..99719ee60
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107245
@@ -0,0 +1,3 @@
+'2357',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107246 b/src/main/res-next/raw/next_gtfs_schedule_stop_107246
new file mode 100644
index 000000000..36532d023
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107246
@@ -0,0 +1,3 @@
+'2357',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107247 b/src/main/res-next/raw/next_gtfs_schedule_stop_107247
new file mode 100644
index 000000000..f23fe528f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107247
@@ -0,0 +1,4 @@
+'2357',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2600,81000,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107248 b/src/main/res-next/raw/next_gtfs_schedule_stop_107248
new file mode 100644
index 000000000..07ad3b98a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107248
@@ -0,0 +1,4 @@
+'2357',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2600,81100,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107249 b/src/main/res-next/raw/next_gtfs_schedule_stop_107249
new file mode 100644
index 000000000..fc4386d50
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107249
@@ -0,0 +1,5 @@
+'2357',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
+'2358',400,63000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1500,64600,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107250 b/src/main/res-next/raw/next_gtfs_schedule_stop_107250
new file mode 100644
index 000000000..f975a5a38
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107250
@@ -0,0 +1,5 @@
+'2357',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'2363',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',1500,64700,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107251 b/src/main/res-next/raw/next_gtfs_schedule_stop_107251
new file mode 100644
index 000000000..078de5c3d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107251
@@ -0,0 +1,5 @@
+'2357',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'2363',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'2358',1500,64800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107252 b/src/main/res-next/raw/next_gtfs_schedule_stop_107252
new file mode 100644
index 000000000..811c67af6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107252
@@ -0,0 +1,5 @@
+'2357',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'2363',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'2358',1500,64800,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107253 b/src/main/res-next/raw/next_gtfs_schedule_stop_107253
new file mode 100644
index 000000000..b3f6395ed
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107253
@@ -0,0 +1,5 @@
+'2357',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'2358',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107254 b/src/main/res-next/raw/next_gtfs_schedule_stop_107254
new file mode 100644
index 000000000..a9ff27d35
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107254
@@ -0,0 +1,8 @@
+'2357',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
+'2363',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'2358',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'2357',3101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64500,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,5400,,'',0,1700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83400,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107255 b/src/main/res-next/raw/next_gtfs_schedule_stop_107255
new file mode 100644
index 000000000..83b104b13
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107255
@@ -0,0 +1,3 @@
+'2357',3101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,64400,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,2900,,'',0,7200,,'',0,3300,,'',0,7700,,'',0,7400,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7800,,'',0,3700,,'',0,1600,,'',0,5800,,'',0,1200,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1600,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,3300,,'',0,7700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3200,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107256 b/src/main/res-next/raw/next_gtfs_schedule_stop_107256
new file mode 100644
index 000000000..02607175d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107256
@@ -0,0 +1,3 @@
+'2357',3101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,64300,,'',0,7100,,'',0,1400,,'',0,1600,,'',0,1400,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1600,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,7700,,'',0,3800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1400,,'',0,5500,,'',0,1300,,'',0,1700,,'',0,1800,,'',0,6900,,'',0,8500,,'',0,12300,,'',0,10700,,'',0
+'2363',3101,83200,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,3400,,'',0,7600,,'',0,7400,,'',0,3600,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3300,,'',0,7600,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107257 b/src/main/res-next/raw/next_gtfs_schedule_stop_107257
new file mode 100644
index 000000000..ece9e4586
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107257
@@ -0,0 +1,10 @@
+'2357',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,103300,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103300,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2363',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',2600,82400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107258 b/src/main/res-next/raw/next_gtfs_schedule_stop_107258
new file mode 100644
index 000000000..8d52eba63
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107258
@@ -0,0 +1,4 @@
+'2357',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2358',1201,71500,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107259 b/src/main/res-next/raw/next_gtfs_schedule_stop_107259
new file mode 100644
index 000000000..daa77416c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107259
@@ -0,0 +1,4 @@
+'2357',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2358',1201,71500,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107260 b/src/main/res-next/raw/next_gtfs_schedule_stop_107260
new file mode 100644
index 000000000..8419aa16d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107260
@@ -0,0 +1,3 @@
+'2357',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107261 b/src/main/res-next/raw/next_gtfs_schedule_stop_107261
new file mode 100644
index 000000000..cb410f2c2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107261
@@ -0,0 +1,3 @@
+'2357',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60500,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107262 b/src/main/res-next/raw/next_gtfs_schedule_stop_107262
new file mode 100644
index 000000000..a67d36ebc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107262
@@ -0,0 +1,3 @@
+'2357',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107263 b/src/main/res-next/raw/next_gtfs_schedule_stop_107263
new file mode 100644
index 000000000..8a67d11c2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107263
@@ -0,0 +1,3 @@
+'2357',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107264 b/src/main/res-next/raw/next_gtfs_schedule_stop_107264
new file mode 100644
index 000000000..74f6abf2a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107264
@@ -0,0 +1,3 @@
+'2357',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107265 b/src/main/res-next/raw/next_gtfs_schedule_stop_107265
new file mode 100644
index 000000000..8db7b424c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107265
@@ -0,0 +1,3 @@
+'2357',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60800,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107267 b/src/main/res-next/raw/next_gtfs_schedule_stop_107267
new file mode 100644
index 000000000..87c841c01
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107267
@@ -0,0 +1,3 @@
+'2357',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60800,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107268 b/src/main/res-next/raw/next_gtfs_schedule_stop_107268
new file mode 100644
index 000000000..4643b5679
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107268
@@ -0,0 +1,3 @@
+'2357',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60900,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107270 b/src/main/res-next/raw/next_gtfs_schedule_stop_107270
new file mode 100644
index 000000000..03767dc35
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107270
@@ -0,0 +1,3 @@
+'2357',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,61000,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107271 b/src/main/res-next/raw/next_gtfs_schedule_stop_107271
new file mode 100644
index 000000000..b7025fffc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107271
@@ -0,0 +1,3 @@
+'2357',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,61000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107272 b/src/main/res-next/raw/next_gtfs_schedule_stop_107272
new file mode 100644
index 000000000..a9b487ce1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107272
@@ -0,0 +1,3 @@
+'2357',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,61100,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107273 b/src/main/res-next/raw/next_gtfs_schedule_stop_107273
new file mode 100644
index 000000000..30755be7f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107273
@@ -0,0 +1,12 @@
+'2357',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2358',601,61400,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,91800,,'',0,4000,,'',0
+'2361',601,91800,,'',0,4000,,'',0
+'2363',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',1701,63200,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,60600,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72500,,'',0
+'2361',2101,72500,,'',0
+'2363',2101,74300,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
+'2358',2401,80100,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107274 b/src/main/res-next/raw/next_gtfs_schedule_stop_107274
new file mode 100644
index 000000000..2b6c0746e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107274
@@ -0,0 +1,12 @@
+'2357',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,91900,,'',0,4000,,'',0
+'2361',601,91900,,'',0,4000,,'',0
+'2363',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',1701,63300,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,60700,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72600,,'',0
+'2361',2101,72600,,'',0
+'2363',2101,74300,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
+'2358',2401,80200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107275 b/src/main/res-next/raw/next_gtfs_schedule_stop_107275
new file mode 100644
index 000000000..680ba2114
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107275
@@ -0,0 +1,6 @@
+'2358',1701,63300,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,60700,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72600,,'',0
+'2361',2101,72600,,'',0
+'2363',2101,74400,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107276 b/src/main/res-next/raw/next_gtfs_schedule_stop_107276
new file mode 100644
index 000000000..2621620ae
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107276
@@ -0,0 +1,6 @@
+'2358',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
+'2357',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65200,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15900,,'',0,13500,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9400,,'',0,15600,,'',0,11000,,'',0
+'2360',2100,82000,,'',0
+'2361',2100,82000,,'',0
+'2363',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107277 b/src/main/res-next/raw/next_gtfs_schedule_stop_107277
new file mode 100644
index 000000000..a4ebec4fc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107277
@@ -0,0 +1,6 @@
+'2357',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2358',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,91900,,'',0,4000,,'',0
+'2361',601,91900,,'',0,4000,,'',0
+'2363',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,80200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107278 b/src/main/res-next/raw/next_gtfs_schedule_stop_107278
new file mode 100644
index 000000000..dbc7f1374
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107278
@@ -0,0 +1,6 @@
+'2357',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2358',601,61600,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92000,,'',0,8000,,'',0
+'2361',601,92000,,'',0,8000,,'',0
+'2363',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,80300,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107279 b/src/main/res-next/raw/next_gtfs_schedule_stop_107279
new file mode 100644
index 000000000..7c4e13b96
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107279
@@ -0,0 +1,3 @@
+'2357',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2358',500,61200,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107280 b/src/main/res-next/raw/next_gtfs_schedule_stop_107280
new file mode 100644
index 000000000..8a3fab8c7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107280
@@ -0,0 +1,3 @@
+'2357',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61300,,'',0,9300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107282 b/src/main/res-next/raw/next_gtfs_schedule_stop_107282
new file mode 100644
index 000000000..6cb8ebea4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107282
@@ -0,0 +1,3 @@
+'2357',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2358',500,61400,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107283 b/src/main/res-next/raw/next_gtfs_schedule_stop_107283
new file mode 100644
index 000000000..6ba8b62cb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107283
@@ -0,0 +1,3 @@
+'2357',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61600,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107284 b/src/main/res-next/raw/next_gtfs_schedule_stop_107284
new file mode 100644
index 000000000..7d3a1660f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107284
@@ -0,0 +1,3 @@
+'2357',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61600,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107285 b/src/main/res-next/raw/next_gtfs_schedule_stop_107285
new file mode 100644
index 000000000..3bdaf1d07
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107285
@@ -0,0 +1,3 @@
+'2357',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61700,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107286 b/src/main/res-next/raw/next_gtfs_schedule_stop_107286
new file mode 100644
index 000000000..879ea3079
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107286
@@ -0,0 +1,4 @@
+'2357',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61800,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
+'2358',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107287 b/src/main/res-next/raw/next_gtfs_schedule_stop_107287
new file mode 100644
index 000000000..59d21a47f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107287
@@ -0,0 +1,4 @@
+'2357',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61900,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'2358',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107288 b/src/main/res-next/raw/next_gtfs_schedule_stop_107288
new file mode 100644
index 000000000..d2f5dd9c8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107288
@@ -0,0 +1,6 @@
+'2357',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55800,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,23400,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85900,,'',0,8000,,'',0
+'2361',601,85900,,'',0,8000,,'',0
+'2363',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74300,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107289 b/src/main/res-next/raw/next_gtfs_schedule_stop_107289
new file mode 100644
index 000000000..e1f4f6dab
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107289
@@ -0,0 +1,6 @@
+'2357',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55800,,'',0,8600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,27500,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
+'2360',601,90000,,'',0,4000,,'',0
+'2361',601,90000,,'',0,4000,,'',0
+'2363',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107290 b/src/main/res-next/raw/next_gtfs_schedule_stop_107290
new file mode 100644
index 000000000..e9478309c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107290
@@ -0,0 +1,6 @@
+'2357',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55900,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90000,,'',0,4000,,'',0
+'2361',601,90000,,'',0,4000,,'',0
+'2363',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107291 b/src/main/res-next/raw/next_gtfs_schedule_stop_107291
new file mode 100644
index 000000000..4b830926a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107291
@@ -0,0 +1,6 @@
+'2357',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55900,,'',0,8600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90100,,'',0,4000,,'',0
+'2361',601,90100,,'',0,4000,,'',0
+'2363',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74500,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107292 b/src/main/res-next/raw/next_gtfs_schedule_stop_107292
new file mode 100644
index 000000000..e60c1c56d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107292
@@ -0,0 +1,6 @@
+'2357',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90200,,'',0,4000,,'',0
+'2361',601,90200,,'',0,4000,,'',0
+'2363',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74600,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107293 b/src/main/res-next/raw/next_gtfs_schedule_stop_107293
new file mode 100644
index 000000000..e60c1c56d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107293
@@ -0,0 +1,6 @@
+'2357',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90200,,'',0,4000,,'',0
+'2361',601,90200,,'',0,4000,,'',0
+'2363',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74600,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107294 b/src/main/res-next/raw/next_gtfs_schedule_stop_107294
new file mode 100644
index 000000000..7bc0a30e1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107294
@@ -0,0 +1,6 @@
+'2357',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60100,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90300,,'',0,4000,,'',0
+'2361',601,90300,,'',0,4000,,'',0
+'2363',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107295 b/src/main/res-next/raw/next_gtfs_schedule_stop_107295
new file mode 100644
index 000000000..95837f0c5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107295
@@ -0,0 +1,6 @@
+'2357',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60200,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90400,,'',0,4000,,'',0
+'2361',601,90400,,'',0,4000,,'',0
+'2363',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74800,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107296 b/src/main/res-next/raw/next_gtfs_schedule_stop_107296
new file mode 100644
index 000000000..cc521a498
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107296
@@ -0,0 +1,6 @@
+'2357',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60300,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90500,,'',0,4000,,'',0
+'2361',601,90500,,'',0,4000,,'',0
+'2363',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107297 b/src/main/res-next/raw/next_gtfs_schedule_stop_107297
new file mode 100644
index 000000000..3308bab5c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107297
@@ -0,0 +1,6 @@
+'2357',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60300,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90500,,'',0,4000,,'',0
+'2361',601,90500,,'',0,4000,,'',0
+'2363',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,74900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107298 b/src/main/res-next/raw/next_gtfs_schedule_stop_107298
new file mode 100644
index 000000000..63c505591
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107298
@@ -0,0 +1,6 @@
+'2357',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60400,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,27400,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90600,,'',0,4000,,'',0
+'2361',601,90600,,'',0,4000,,'',0
+'2363',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
+'2358',2401,75000,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107299 b/src/main/res-next/raw/next_gtfs_schedule_stop_107299
new file mode 100644
index 000000000..5539763d7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107299
@@ -0,0 +1,6 @@
+'2357',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,60400,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90600,,'',0,4000,,'',0
+'2361',601,90600,,'',0,4000,,'',0
+'2363',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75000,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107300 b/src/main/res-next/raw/next_gtfs_schedule_stop_107300
new file mode 100644
index 000000000..7f89a6d9a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107300
@@ -0,0 +1,6 @@
+'2357',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60500,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90700,,'',0,4000,,'',0
+'2361',601,90700,,'',0,4000,,'',0
+'2363',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75100,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107301 b/src/main/res-next/raw/next_gtfs_schedule_stop_107301
new file mode 100644
index 000000000..bc0c9860a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107301
@@ -0,0 +1,6 @@
+'2357',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90800,,'',0,4000,,'',0
+'2361',601,90800,,'',0,4000,,'',0
+'2363',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107302 b/src/main/res-next/raw/next_gtfs_schedule_stop_107302
new file mode 100644
index 000000000..bc0c9860a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107302
@@ -0,0 +1,6 @@
+'2357',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90800,,'',0,4000,,'',0
+'2361',601,90800,,'',0,4000,,'',0
+'2363',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75200,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107303 b/src/main/res-next/raw/next_gtfs_schedule_stop_107303
new file mode 100644
index 000000000..3fa7f13eb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107303
@@ -0,0 +1,6 @@
+'2357',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60700,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,90900,,'',0,4000,,'',0
+'2361',601,90900,,'',0,4000,,'',0
+'2363',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75300,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107304 b/src/main/res-next/raw/next_gtfs_schedule_stop_107304
new file mode 100644
index 000000000..cc85391a6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107304
@@ -0,0 +1,6 @@
+'2357',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,60700,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8200,,'',0,9000,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91000,,'',0,4000,,'',0
+'2361',601,91000,,'',0,4000,,'',0
+'2363',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107305 b/src/main/res-next/raw/next_gtfs_schedule_stop_107305
new file mode 100644
index 000000000..24c3c7c85
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107305
@@ -0,0 +1,6 @@
+'2357',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60800,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8300,,'',0,8900,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91000,,'',0,4000,,'',0
+'2361',601,91000,,'',0,4000,,'',0
+'2363',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107306 b/src/main/res-next/raw/next_gtfs_schedule_stop_107306
new file mode 100644
index 000000000..fd61aa3fa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107306
@@ -0,0 +1,6 @@
+'2357',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2358',601,60900,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91100,,'',0,4000,,'',0
+'2361',601,91100,,'',0,4000,,'',0
+'2363',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75500,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107307 b/src/main/res-next/raw/next_gtfs_schedule_stop_107307
new file mode 100644
index 000000000..48c893ef3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107307
@@ -0,0 +1,6 @@
+'2357',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,60900,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91200,,'',0,4000,,'',0
+'2361',601,91200,,'',0,4000,,'',0
+'2363',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,75600,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107308 b/src/main/res-next/raw/next_gtfs_schedule_stop_107308
new file mode 100644
index 000000000..6ac372c2f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107308
@@ -0,0 +1,9 @@
+'2357',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,61000,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91300,,'',0,4000,,'',0
+'2361',601,91300,,'',0,4000,,'',0
+'2363',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2201,151700,,'',0
+'2360',2201,90100,,'',0
+'2361',2201,83100,,'',0
+'2358',2401,75700,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107309 b/src/main/res-next/raw/next_gtfs_schedule_stop_107309
new file mode 100644
index 000000000..f142e3a08
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107309
@@ -0,0 +1,9 @@
+'2357',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2358',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91400,,'',0,4000,,'',0
+'2361',601,91400,,'',0,4000,,'',0
+'2363',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2201,151800,,'',0
+'2360',2201,90200,,'',0
+'2361',2201,83200,,'',0
+'2358',2401,75800,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107310 b/src/main/res-next/raw/next_gtfs_schedule_stop_107310
new file mode 100644
index 000000000..9dc58e922
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107310
@@ -0,0 +1,6 @@
+'2357',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92100,,'',0,8000,,'',0
+'2361',601,92100,,'',0,8000,,'',0
+'2363',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,80400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107311 b/src/main/res-next/raw/next_gtfs_schedule_stop_107311
new file mode 100644
index 000000000..9dc58e922
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107311
@@ -0,0 +1,6 @@
+'2357',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92100,,'',0,8000,,'',0
+'2361',601,92100,,'',0,8000,,'',0
+'2363',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,80400,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107312 b/src/main/res-next/raw/next_gtfs_schedule_stop_107312
new file mode 100644
index 000000000..218d4d13a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107312
@@ -0,0 +1,6 @@
+'2357',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61800,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92200,,'',0,8000,,'',0
+'2361',601,92200,,'',0,8000,,'',0
+'2363',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'2358',2401,80500,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107313 b/src/main/res-next/raw/next_gtfs_schedule_stop_107313
new file mode 100644
index 000000000..95fd4a5e9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107313
@@ -0,0 +1,5 @@
+'2357',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92300,,'',0,8000,,'',0
+'2361',601,92300,,'',0,8000,,'',0
+'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107314 b/src/main/res-next/raw/next_gtfs_schedule_stop_107314
new file mode 100644
index 000000000..2220b0ec7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107314
@@ -0,0 +1,5 @@
+'2357',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92300,,'',0,8000,,'',0
+'2361',601,92300,,'',0,8000,,'',0
+'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107315 b/src/main/res-next/raw/next_gtfs_schedule_stop_107315
new file mode 100644
index 000000000..29abf018e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107315
@@ -0,0 +1,5 @@
+'2357',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,61900,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
+'2360',601,92400,,'',0,8000,,'',0
+'2361',601,92400,,'',0,8000,,'',0
+'2363',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107316 b/src/main/res-next/raw/next_gtfs_schedule_stop_107316
new file mode 100644
index 000000000..4ce597667
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107316
@@ -0,0 +1,5 @@
+'2357',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,62000,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27400,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
+'2360',601,92500,,'',0,8000,,'',0
+'2361',601,92500,,'',0,8000,,'',0
+'2363',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107317 b/src/main/res-next/raw/next_gtfs_schedule_stop_107317
new file mode 100644
index 000000000..cbbd7d47d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107317
@@ -0,0 +1,5 @@
+'2357',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2358',601,62100,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27500,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
+'2360',601,92500,,'',0,8000,,'',0
+'2361',601,92500,,'',0,8000,,'',0
+'2363',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107318 b/src/main/res-next/raw/next_gtfs_schedule_stop_107318
new file mode 100644
index 000000000..af8e9ebec
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107318
@@ -0,0 +1,4 @@
+'2357',700,60700,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,62000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,60700,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,73800,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107319 b/src/main/res-next/raw/next_gtfs_schedule_stop_107319
new file mode 100644
index 000000000..be1fb3189
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107319
@@ -0,0 +1,4 @@
+'2357',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,73900,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107320 b/src/main/res-next/raw/next_gtfs_schedule_stop_107320
new file mode 100644
index 000000000..25f8945a4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107320
@@ -0,0 +1,4 @@
+'2357',700,60800,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,62100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,60800,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,73900,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107321 b/src/main/res-next/raw/next_gtfs_schedule_stop_107321
new file mode 100644
index 000000000..45eb1b7db
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107321
@@ -0,0 +1,4 @@
+'2357',700,61000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62300,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2358',1600,74100,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107322 b/src/main/res-next/raw/next_gtfs_schedule_stop_107322
new file mode 100644
index 000000000..711923460
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107322
@@ -0,0 +1,3 @@
+'2357',700,61000,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107324 b/src/main/res-next/raw/next_gtfs_schedule_stop_107324
new file mode 100644
index 000000000..a193458d8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107324
@@ -0,0 +1,3 @@
+'2357',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107325 b/src/main/res-next/raw/next_gtfs_schedule_stop_107325
new file mode 100644
index 000000000..a193458d8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107325
@@ -0,0 +1,3 @@
+'2357',700,61100,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62500,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107326 b/src/main/res-next/raw/next_gtfs_schedule_stop_107326
new file mode 100644
index 000000000..9eb107f36
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107326
@@ -0,0 +1,3 @@
+'2357',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107327 b/src/main/res-next/raw/next_gtfs_schedule_stop_107327
new file mode 100644
index 000000000..640436249
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107327
@@ -0,0 +1,3 @@
+'2357',700,61200,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62600,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61200,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107328 b/src/main/res-next/raw/next_gtfs_schedule_stop_107328
new file mode 100644
index 000000000..c46d67d9d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107328
@@ -0,0 +1,3 @@
+'2357',700,61300,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62700,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61300,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107329 b/src/main/res-next/raw/next_gtfs_schedule_stop_107329
new file mode 100644
index 000000000..626b0255c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107329
@@ -0,0 +1,3 @@
+'2357',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107330 b/src/main/res-next/raw/next_gtfs_schedule_stop_107330
new file mode 100644
index 000000000..626b0255c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107330
@@ -0,0 +1,3 @@
+'2357',700,61400,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62800,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61400,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107331 b/src/main/res-next/raw/next_gtfs_schedule_stop_107331
new file mode 100644
index 000000000..9d26da0fc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107331
@@ -0,0 +1,4 @@
+'2357',700,61500,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61500,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
+'2358',1600,74700,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107332 b/src/main/res-next/raw/next_gtfs_schedule_stop_107332
new file mode 100644
index 000000000..5784fec53
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107332
@@ -0,0 +1,4 @@
+'2357',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
+'2358',1600,74800,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107333 b/src/main/res-next/raw/next_gtfs_schedule_stop_107333
new file mode 100644
index 000000000..fe77a5faa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107333
@@ -0,0 +1,4 @@
+'2357',700,61600,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,63000,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61600,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
+'2358',1600,74900,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107334 b/src/main/res-next/raw/next_gtfs_schedule_stop_107334
new file mode 100644
index 000000000..7eff541c4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107334
@@ -0,0 +1,4 @@
+'2357',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
+'2363',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
+'2358',1600,74900,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107335 b/src/main/res-next/raw/next_gtfs_schedule_stop_107335
new file mode 100644
index 000000000..a92bc9b69
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107335
@@ -0,0 +1,4 @@
+'2357',700,61700,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,63100,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
+'2363',700,61700,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
+'2358',1600,75000,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107336 b/src/main/res-next/raw/next_gtfs_schedule_stop_107336
new file mode 100644
index 000000000..8819d6313
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107336
@@ -0,0 +1,3 @@
+'2357',700,61800,0,'Sumas Mtn',0,10100,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,63200,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10600,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,14900,0,'Sumas Mtn',0
+'2363',700,61800,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9600,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,16900,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107337 b/src/main/res-next/raw/next_gtfs_schedule_stop_107337
new file mode 100644
index 000000000..f0d5fe0e5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107337
@@ -0,0 +1,6 @@
+'2357',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
+'2357',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2358',700,63300,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,24900,4,'',0
+'2358',701,63300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'2363',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
+'2363',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107338 b/src/main/res-next/raw/next_gtfs_schedule_stop_107338
new file mode 100644
index 000000000..cd43474a8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107338
@@ -0,0 +1,3 @@
+'2357',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62000,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107339 b/src/main/res-next/raw/next_gtfs_schedule_stop_107339
new file mode 100644
index 000000000..cd43474a8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107339
@@ -0,0 +1,3 @@
+'2357',701,62000,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63400,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62000,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107340 b/src/main/res-next/raw/next_gtfs_schedule_stop_107340
new file mode 100644
index 000000000..afa6d827a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107340
@@ -0,0 +1,3 @@
+'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107341 b/src/main/res-next/raw/next_gtfs_schedule_stop_107341
new file mode 100644
index 000000000..afa6d827a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107341
@@ -0,0 +1,3 @@
+'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63500,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107342 b/src/main/res-next/raw/next_gtfs_schedule_stop_107342
new file mode 100644
index 000000000..c4074fad7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107342
@@ -0,0 +1,3 @@
+'2357',701,62100,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62100,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107343 b/src/main/res-next/raw/next_gtfs_schedule_stop_107343
new file mode 100644
index 000000000..bfdca9b43
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107343
@@ -0,0 +1,3 @@
+'2357',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63600,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62200,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107344 b/src/main/res-next/raw/next_gtfs_schedule_stop_107344
new file mode 100644
index 000000000..54fc7eeb7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107344
@@ -0,0 +1,3 @@
+'2357',701,62200,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63600,0,'Montrose Exch',0,11700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62200,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107345 b/src/main/res-next/raw/next_gtfs_schedule_stop_107345
new file mode 100644
index 000000000..a6fd737ef
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107345
@@ -0,0 +1,3 @@
+'2357',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63700,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62300,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11100,,'',0,10500,,'',0,10300,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107346 b/src/main/res-next/raw/next_gtfs_schedule_stop_107346
new file mode 100644
index 000000000..bb75d8875
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107346
@@ -0,0 +1,3 @@
+'2357',701,62300,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63800,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62300,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,16900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107347 b/src/main/res-next/raw/next_gtfs_schedule_stop_107347
new file mode 100644
index 000000000..e6325a1f6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107347
@@ -0,0 +1,3 @@
+'2357',701,62400,,'',0,10100,,'',0,10100,,'',0,9500,,'',0,9600,,'',0,10100,,'',0,9900,,'',0,10100,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,12500,,'',0
+'2358',701,63900,0,'Montrose Exch',0,11600,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,3600,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,14400,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14900,0,'Montrose Exch',0
+'2363',701,62400,,'',0,10100,,'',0,9600,,'',0,9000,,'',0,11200,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,10600,,'',0,10400,,'',0,10400,,'',0,10400,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107348 b/src/main/res-next/raw/next_gtfs_schedule_stop_107348
new file mode 100644
index 000000000..eb34d632b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107348
@@ -0,0 +1,4 @@
+'2357',701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2358',701,75500,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0
+'2363',701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'2358',1601,75600,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107349 b/src/main/res-next/raw/next_gtfs_schedule_stop_107349
new file mode 100644
index 000000000..ec3d561fb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107349
@@ -0,0 +1,4 @@
+'2357',701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2358',701,75700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'2363',701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'2358',1601,75700,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107350 b/src/main/res-next/raw/next_gtfs_schedule_stop_107350
new file mode 100644
index 000000000..4b3b8ec65
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107350
@@ -0,0 +1,9 @@
+'2357',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,51400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,8900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,4000,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,102300,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2361',201,102300,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2363',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'2357',701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2358',701,75800,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'2363',701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'2358',1601,75800,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107351 b/src/main/res-next/raw/next_gtfs_schedule_stop_107351
new file mode 100644
index 000000000..907e50a59
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107351
@@ -0,0 +1,4 @@
+'2357',701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2358',701,75900,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'2363',701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'2358',1601,75900,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107352 b/src/main/res-next/raw/next_gtfs_schedule_stop_107352
new file mode 100644
index 000000000..8f376c63c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107352
@@ -0,0 +1,4 @@
+'2357',701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2358',701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'2363',701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107353 b/src/main/res-next/raw/next_gtfs_schedule_stop_107353
new file mode 100644
index 000000000..7a3e6c63c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107353
@@ -0,0 +1,4 @@
+'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64200,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,3300,0,'Montrose Exch',0,14600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'2363',701,62900,,'',0,9900,,'',0,9800,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
+'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107354 b/src/main/res-next/raw/next_gtfs_schedule_stop_107354
new file mode 100644
index 000000000..cc4a0fdd8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107354
@@ -0,0 +1,4 @@
+'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'2363',701,62900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
+'2358',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107355 b/src/main/res-next/raw/next_gtfs_schedule_stop_107355
new file mode 100644
index 000000000..1750f6fa3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107355
@@ -0,0 +1,4 @@
+'2357',701,62700,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64200,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'2363',701,62900,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
+'2358',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107356 b/src/main/res-next/raw/next_gtfs_schedule_stop_107356
new file mode 100644
index 000000000..9c9eef63b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107356
@@ -0,0 +1,4 @@
+'2357',701,62800,,'',0,10300,,'',0,9900,,'',0,9700,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64300,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'2363',701,63000,,'',0,9900,,'',0,9800,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,10200,,'',0,14200,,'',0,10300,,'',0,10000,,'',0,12900,,'',0
+'2358',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107357 b/src/main/res-next/raw/next_gtfs_schedule_stop_107357
new file mode 100644
index 000000000..d1f7305ef
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107357
@@ -0,0 +1,3 @@
+'2357',701,62800,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'2363',701,63000,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,10600,,'',0,14200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107358 b/src/main/res-next/raw/next_gtfs_schedule_stop_107358
new file mode 100644
index 000000000..31d42e072
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107358
@@ -0,0 +1 @@
+'2358',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107359 b/src/main/res-next/raw/next_gtfs_schedule_stop_107359
new file mode 100644
index 000000000..31d42e072
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107359
@@ -0,0 +1 @@
+'2358',1201,71600,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107360 b/src/main/res-next/raw/next_gtfs_schedule_stop_107360
new file mode 100644
index 000000000..ed2b740aa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107360
@@ -0,0 +1 @@
+'2358',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107361 b/src/main/res-next/raw/next_gtfs_schedule_stop_107361
new file mode 100644
index 000000000..ed2b740aa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107361
@@ -0,0 +1 @@
+'2358',1201,71700,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107363 b/src/main/res-next/raw/next_gtfs_schedule_stop_107363
new file mode 100644
index 000000000..a2f1cd237
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107363
@@ -0,0 +1 @@
+'2358',1201,71800,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107364 b/src/main/res-next/raw/next_gtfs_schedule_stop_107364
new file mode 100644
index 000000000..16f658047
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107364
@@ -0,0 +1 @@
+'2358',1200,72700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,3200,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107365 b/src/main/res-next/raw/next_gtfs_schedule_stop_107365
new file mode 100644
index 000000000..387087361
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107365
@@ -0,0 +1 @@
+'2358',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,1800,,'',0,8900,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107366 b/src/main/res-next/raw/next_gtfs_schedule_stop_107366
new file mode 100644
index 000000000..f4cecc39e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107366
@@ -0,0 +1 @@
+'2358',1200,72800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107367 b/src/main/res-next/raw/next_gtfs_schedule_stop_107367
new file mode 100644
index 000000000..30c0535ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107367
@@ -0,0 +1 @@
+'2358',1200,72900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107368 b/src/main/res-next/raw/next_gtfs_schedule_stop_107368
new file mode 100644
index 000000000..a1f56ded5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107368
@@ -0,0 +1 @@
+'2358',1200,73000,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107369 b/src/main/res-next/raw/next_gtfs_schedule_stop_107369
new file mode 100644
index 000000000..35f93272f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107369
@@ -0,0 +1 @@
+'2358',1200,73100,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107370 b/src/main/res-next/raw/next_gtfs_schedule_stop_107370
new file mode 100644
index 000000000..fcaa5bf90
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107370
@@ -0,0 +1 @@
+'2358',1200,73200,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107371 b/src/main/res-next/raw/next_gtfs_schedule_stop_107371
new file mode 100644
index 000000000..10217081e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107371
@@ -0,0 +1 @@
+'2358',1200,73500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107372 b/src/main/res-next/raw/next_gtfs_schedule_stop_107372
new file mode 100644
index 000000000..aca9f0fa7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107372
@@ -0,0 +1 @@
+'2358',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,1800,,'',0,8700,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107373 b/src/main/res-next/raw/next_gtfs_schedule_stop_107373
new file mode 100644
index 000000000..aeb857bd9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107373
@@ -0,0 +1 @@
+'2358',1200,73600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107374 b/src/main/res-next/raw/next_gtfs_schedule_stop_107374
new file mode 100644
index 000000000..bf6161af8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107374
@@ -0,0 +1,3 @@
+'2358',1501,62000,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
+'2363',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2600,81100,,'',0,63700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107375 b/src/main/res-next/raw/next_gtfs_schedule_stop_107375
new file mode 100644
index 000000000..f2b2fd1d9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107375
@@ -0,0 +1,3 @@
+'2358',1500,64400,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2358',2601,75800,,'',0,67500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107377 b/src/main/res-next/raw/next_gtfs_schedule_stop_107377
new file mode 100644
index 000000000..0d6603821
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107377
@@ -0,0 +1,2 @@
+'2358',1500,64000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107378 b/src/main/res-next/raw/next_gtfs_schedule_stop_107378
new file mode 100644
index 000000000..5a86f6ec5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107378
@@ -0,0 +1,2 @@
+'2358',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107379 b/src/main/res-next/raw/next_gtfs_schedule_stop_107379
new file mode 100644
index 000000000..974f9014a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107379
@@ -0,0 +1,2 @@
+'2358',1501,62500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107380 b/src/main/res-next/raw/next_gtfs_schedule_stop_107380
new file mode 100644
index 000000000..34ef47a19
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107380
@@ -0,0 +1,2 @@
+'2358',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107381 b/src/main/res-next/raw/next_gtfs_schedule_stop_107381
new file mode 100644
index 000000000..f033f2d28
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107381
@@ -0,0 +1,2 @@
+'2358',1501,62900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107382 b/src/main/res-next/raw/next_gtfs_schedule_stop_107382
new file mode 100644
index 000000000..5799b79e6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107382
@@ -0,0 +1,2 @@
+'2358',1501,63000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107383 b/src/main/res-next/raw/next_gtfs_schedule_stop_107383
new file mode 100644
index 000000000..2f401bf0d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107383
@@ -0,0 +1,2 @@
+'2358',1501,63100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107384 b/src/main/res-next/raw/next_gtfs_schedule_stop_107384
new file mode 100644
index 000000000..e4f7923f3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107384
@@ -0,0 +1,2 @@
+'2358',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107385 b/src/main/res-next/raw/next_gtfs_schedule_stop_107385
new file mode 100644
index 000000000..0f78be31b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107385
@@ -0,0 +1,4 @@
+'2358',1500,63400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2358',1501,63400,4,'',0,8300,4,'',0,11900,4,'',0,68400,4,'',0,20300,4,'',0,9000,4,'',0
+'2363',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2363',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107386 b/src/main/res-next/raw/next_gtfs_schedule_stop_107386
new file mode 100644
index 000000000..0af9d71bb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107386
@@ -0,0 +1,2 @@
+'2358',1500,63500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107387 b/src/main/res-next/raw/next_gtfs_schedule_stop_107387
new file mode 100644
index 000000000..b6d8cf11b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107387
@@ -0,0 +1,2 @@
+'2358',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107388 b/src/main/res-next/raw/next_gtfs_schedule_stop_107388
new file mode 100644
index 000000000..b6d8cf11b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107388
@@ -0,0 +1,2 @@
+'2358',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107389 b/src/main/res-next/raw/next_gtfs_schedule_stop_107389
new file mode 100644
index 000000000..24b29d951
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107389
@@ -0,0 +1,2 @@
+'2358',1500,63900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107390 b/src/main/res-next/raw/next_gtfs_schedule_stop_107390
new file mode 100644
index 000000000..2bc1c1afa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107390
@@ -0,0 +1,3 @@
+'2358',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2358',2600,145800,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107391 b/src/main/res-next/raw/next_gtfs_schedule_stop_107391
new file mode 100644
index 000000000..ea4673b1e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107391
@@ -0,0 +1,3 @@
+'2358',1500,64500,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'2358',2601,75900,,'',0,67500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107392 b/src/main/res-next/raw/next_gtfs_schedule_stop_107392
new file mode 100644
index 000000000..08060fbb6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107392
@@ -0,0 +1,3 @@
+'2357',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0
+'2363',701,63500,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107393 b/src/main/res-next/raw/next_gtfs_schedule_stop_107393
new file mode 100644
index 000000000..24f29405c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107393
@@ -0,0 +1,3 @@
+'2357',701,63100,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'2363',701,63300,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107394 b/src/main/res-next/raw/next_gtfs_schedule_stop_107394
new file mode 100644
index 000000000..4e768eaf2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107394
@@ -0,0 +1 @@
+'2358',1600,74200,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107395 b/src/main/res-next/raw/next_gtfs_schedule_stop_107395
new file mode 100644
index 000000000..a089d5247
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107395
@@ -0,0 +1 @@
+'2358',1600,74400,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107396 b/src/main/res-next/raw/next_gtfs_schedule_stop_107396
new file mode 100644
index 000000000..a089d5247
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107396
@@ -0,0 +1 @@
+'2358',1600,74400,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107397 b/src/main/res-next/raw/next_gtfs_schedule_stop_107397
new file mode 100644
index 000000000..684971d01
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107397
@@ -0,0 +1 @@
+'2358',1600,74500,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107398 b/src/main/res-next/raw/next_gtfs_schedule_stop_107398
new file mode 100644
index 000000000..684971d01
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107398
@@ -0,0 +1 @@
+'2358',1600,74500,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107399 b/src/main/res-next/raw/next_gtfs_schedule_stop_107399
new file mode 100644
index 000000000..0a51a854d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107399
@@ -0,0 +1 @@
+'2358',1600,74600,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107400 b/src/main/res-next/raw/next_gtfs_schedule_stop_107400
new file mode 100644
index 000000000..197f5795f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107400
@@ -0,0 +1,2 @@
+'2358',1600,75100,4,'',0,15900,4,'',0,64400,4,'',0,8500,4,'',0
+'2358',1601,75100,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107401 b/src/main/res-next/raw/next_gtfs_schedule_stop_107401
new file mode 100644
index 000000000..2e97c02a1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107401
@@ -0,0 +1 @@
+'2358',1601,75200,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107402 b/src/main/res-next/raw/next_gtfs_schedule_stop_107402
new file mode 100644
index 000000000..2e97c02a1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107402
@@ -0,0 +1 @@
+'2358',1601,75200,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107403 b/src/main/res-next/raw/next_gtfs_schedule_stop_107403
new file mode 100644
index 000000000..32d0539b2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107403
@@ -0,0 +1 @@
+'2358',1601,75300,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107404 b/src/main/res-next/raw/next_gtfs_schedule_stop_107404
new file mode 100644
index 000000000..4fdbb0fea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107404
@@ -0,0 +1 @@
+'2358',1601,75400,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107405 b/src/main/res-next/raw/next_gtfs_schedule_stop_107405
new file mode 100644
index 000000000..3df4e3e45
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107405
@@ -0,0 +1 @@
+'2358',1601,80300,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107406 b/src/main/res-next/raw/next_gtfs_schedule_stop_107406
new file mode 100644
index 000000000..fedd0242f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107406
@@ -0,0 +1 @@
+'2358',1601,80300,,'',0,11900,,'',0,68500,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107407 b/src/main/res-next/raw/next_gtfs_schedule_stop_107407
new file mode 100644
index 000000000..fe675959b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107407
@@ -0,0 +1 @@
+'2358',1601,80500,,'',0,11900,,'',0,68400,,'',0,4600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107408 b/src/main/res-next/raw/next_gtfs_schedule_stop_107408
new file mode 100644
index 000000000..5965d8601
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107408
@@ -0,0 +1,7 @@
+'2358',1701,63100,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,17400,,'',0
+'2358',2101,60500,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15300,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8800,,'',0,4500,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
+'2360',2101,72400,,'',0
+'2361',2101,72400,,'',0
+'2363',2101,74200,,'',0,20000,,'',0,11600,,'',0,19300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
+'2358',2401,80000,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107409 b/src/main/res-next/raw/next_gtfs_schedule_stop_107409
new file mode 100644
index 000000000..4b602c69c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107409
@@ -0,0 +1,6 @@
+'2358',1701,63400,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,60800,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72700,,'',0
+'2361',2101,72700,,'',0
+'2363',2101,74500,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107410 b/src/main/res-next/raw/next_gtfs_schedule_stop_107410
new file mode 100644
index 000000000..a27b666fc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107410
@@ -0,0 +1,6 @@
+'2358',1701,63500,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2357',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,60900,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72800,,'',0
+'2361',2101,72800,,'',0
+'2363',2101,74600,,'',0,20000,,'',0,15700,,'',0,15300,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107411 b/src/main/res-next/raw/next_gtfs_schedule_stop_107411
new file mode 100644
index 000000000..723da95ab
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107411
@@ -0,0 +1 @@
+'2358',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107412 b/src/main/res-next/raw/next_gtfs_schedule_stop_107412
new file mode 100644
index 000000000..0553ae26c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107412
@@ -0,0 +1 @@
+'2358',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107413 b/src/main/res-next/raw/next_gtfs_schedule_stop_107413
new file mode 100644
index 000000000..35b78ed69
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107413
@@ -0,0 +1 @@
+'2358',1700,64300,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107414 b/src/main/res-next/raw/next_gtfs_schedule_stop_107414
new file mode 100644
index 000000000..032080cee
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107414
@@ -0,0 +1,6 @@
+'2358',1700,64400,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
+'2357',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64900,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3300,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81700,,'',0
+'2361',2100,81700,,'',0
+'2363',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107415 b/src/main/res-next/raw/next_gtfs_schedule_stop_107415
new file mode 100644
index 000000000..adcf26ed9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107415
@@ -0,0 +1,6 @@
+'2358',1700,64500,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
+'2357',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65000,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3300,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81800,,'',0
+'2361',2100,81800,,'',0
+'2363',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107416 b/src/main/res-next/raw/next_gtfs_schedule_stop_107416
new file mode 100644
index 000000000..723da95ab
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107416
@@ -0,0 +1 @@
+'2358',1701,63600,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107417 b/src/main/res-next/raw/next_gtfs_schedule_stop_107417
new file mode 100644
index 000000000..304ae6aa6
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107417
@@ -0,0 +1,2 @@
+'2358',1700,63700,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2358',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76400,4,'',0,3700,4,'',0,8300,4,'',0,7800,4,'',0,3600,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107418 b/src/main/res-next/raw/next_gtfs_schedule_stop_107418
new file mode 100644
index 000000000..7c13741a3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107418
@@ -0,0 +1 @@
+'2358',1700,63800,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107419 b/src/main/res-next/raw/next_gtfs_schedule_stop_107419
new file mode 100644
index 000000000..c46082dc3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107419
@@ -0,0 +1 @@
+'2358',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107420 b/src/main/res-next/raw/next_gtfs_schedule_stop_107420
new file mode 100644
index 000000000..c46082dc3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107420
@@ -0,0 +1 @@
+'2358',1700,63900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107421 b/src/main/res-next/raw/next_gtfs_schedule_stop_107421
new file mode 100644
index 000000000..acd41b902
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107421
@@ -0,0 +1 @@
+'2358',1700,64000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,3600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107422 b/src/main/res-next/raw/next_gtfs_schedule_stop_107422
new file mode 100644
index 000000000..6ae76d380
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107422
@@ -0,0 +1 @@
+'2358',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107423 b/src/main/res-next/raw/next_gtfs_schedule_stop_107423
new file mode 100644
index 000000000..6ae76d380
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107423
@@ -0,0 +1 @@
+'2358',1700,64100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107424 b/src/main/res-next/raw/next_gtfs_schedule_stop_107424
new file mode 100644
index 000000000..0553ae26c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107424
@@ -0,0 +1 @@
+'2358',1700,64200,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107425 b/src/main/res-next/raw/next_gtfs_schedule_stop_107425
new file mode 100644
index 000000000..ecef2f5b8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107425
@@ -0,0 +1,6 @@
+'2358',1700,64600,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
+'2357',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65100,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,7800,,'',0,9400,,'',0,3400,,'',0,9600,,'',0,11600,,'',0,14900,,'',0
+'2360',2100,81900,,'',0
+'2361',2100,81900,,'',0
+'2363',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107426 b/src/main/res-next/raw/next_gtfs_schedule_stop_107426
new file mode 100644
index 000000000..f8789b354
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107426
@@ -0,0 +1,6 @@
+'2358',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
+'2357',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,65200,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13500,,'',0,7700,,'',0,9400,,'',0,3400,,'',0,9600,,'',0,15600,,'',0,10900,,'',0
+'2360',2100,82000,,'',0
+'2361',2100,82000,,'',0
+'2363',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9400,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107427 b/src/main/res-next/raw/next_gtfs_schedule_stop_107427
new file mode 100644
index 000000000..688153c2a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107427
@@ -0,0 +1,5 @@
+'2357',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61000,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,72900,,'',0
+'2361',2101,72900,,'',0
+'2363',2101,74600,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107428 b/src/main/res-next/raw/next_gtfs_schedule_stop_107428
new file mode 100644
index 000000000..a59991957
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107428
@@ -0,0 +1,3 @@
+'2357',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61200,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,14100,,'',0,11900,,'',0,11100,,'',0
+'2363',2101,74700,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107429 b/src/main/res-next/raw/next_gtfs_schedule_stop_107429
new file mode 100644
index 000000000..4c9b2a390
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107429
@@ -0,0 +1,5 @@
+'2357',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
+'2360',2101,74100,,'',0
+'2361',2101,74100,,'',0
+'2363',2101,74900,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107430 b/src/main/res-next/raw/next_gtfs_schedule_stop_107430
new file mode 100644
index 000000000..4c9b2a390
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107430
@@ -0,0 +1,5 @@
+'2357',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61400,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
+'2360',2101,74100,,'',0
+'2361',2101,74100,,'',0
+'2363',2101,74900,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107431 b/src/main/res-next/raw/next_gtfs_schedule_stop_107431
new file mode 100644
index 000000000..12c0f7b72
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107431
@@ -0,0 +1,5 @@
+'2357',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61500,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
+'2360',2101,74200,,'',0
+'2361',2101,74200,,'',0
+'2363',2101,75000,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107432 b/src/main/res-next/raw/next_gtfs_schedule_stop_107432
new file mode 100644
index 000000000..ce2ef50e7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107432
@@ -0,0 +1,5 @@
+'2357',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61600,,'',0,3600,,'',0,18800,,'',0,11900,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,8500,,'',0,10100,,'',0,11900,,'',0,11100,,'',0
+'2360',2101,74300,,'',0
+'2361',2101,74300,,'',0
+'2363',2101,75100,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107433 b/src/main/res-next/raw/next_gtfs_schedule_stop_107433
new file mode 100644
index 000000000..906f634bd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107433
@@ -0,0 +1,5 @@
+'2357',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61800,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11500,,'',0,17100,,'',0,3100,,'',0,8900,,'',0,8500,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
+'2360',2101,74500,,'',0
+'2361',2101,74500,,'',0
+'2363',2101,75300,,'',0,20000,,'',0,15700,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107434 b/src/main/res-next/raw/next_gtfs_schedule_stop_107434
new file mode 100644
index 000000000..e8df6f5fa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107434
@@ -0,0 +1,5 @@
+'2357',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
+'2358',2101,62000,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17000,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10100,,'',0,11800,,'',0,11100,,'',0
+'2360',2101,74700,,'',0
+'2361',2101,74700,,'',0
+'2363',2101,75500,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107435 b/src/main/res-next/raw/next_gtfs_schedule_stop_107435
new file mode 100644
index 000000000..8d164de59
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107435
@@ -0,0 +1,5 @@
+'2357',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
+'2358',2101,62100,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
+'2360',2101,74800,,'',0
+'2361',2101,74800,,'',0
+'2363',2101,75600,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107436 b/src/main/res-next/raw/next_gtfs_schedule_stop_107436
new file mode 100644
index 000000000..03edb458a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107436
@@ -0,0 +1,5 @@
+'2357',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
+'2358',2101,62200,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
+'2360',2101,74900,,'',0
+'2361',2101,74900,,'',0
+'2363',2101,75700,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107437 b/src/main/res-next/raw/next_gtfs_schedule_stop_107437
new file mode 100644
index 000000000..e21e80e41
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107437
@@ -0,0 +1,5 @@
+'2357',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
+'2358',2101,62300,,'',0,3600,,'',0,18800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
+'2360',2101,75000,,'',0
+'2361',2101,75000,,'',0
+'2363',2101,75800,,'',0,20000,,'',0,15800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107438 b/src/main/res-next/raw/next_gtfs_schedule_stop_107438
new file mode 100644
index 000000000..46259fe01
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107438
@@ -0,0 +1,5 @@
+'2357',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,63700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80500,,'',0
+'2361',2100,80500,,'',0
+'2363',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107440 b/src/main/res-next/raw/next_gtfs_schedule_stop_107440
new file mode 100644
index 000000000..19bdbd59c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107440
@@ -0,0 +1,5 @@
+'2357',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,63800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80600,,'',0
+'2361',2100,80600,,'',0
+'2363',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107441 b/src/main/res-next/raw/next_gtfs_schedule_stop_107441
new file mode 100644
index 000000000..7b06a0aa2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107441
@@ -0,0 +1,5 @@
+'2357',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,63800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80600,,'',0
+'2361',2100,80600,,'',0
+'2363',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107442 b/src/main/res-next/raw/next_gtfs_schedule_stop_107442
new file mode 100644
index 000000000..2aa88c1e9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107442
@@ -0,0 +1,5 @@
+'2357',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,63900,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80700,,'',0
+'2361',2100,80700,,'',0
+'2363',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107443 b/src/main/res-next/raw/next_gtfs_schedule_stop_107443
new file mode 100644
index 000000000..8706be7a3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107443
@@ -0,0 +1,5 @@
+'2357',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,64000,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80800,,'',0
+'2361',2100,80800,,'',0
+'2363',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107444 b/src/main/res-next/raw/next_gtfs_schedule_stop_107444
new file mode 100644
index 000000000..07c2d3d3f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107444
@@ -0,0 +1,5 @@
+'2357',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64100,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80900,,'',0
+'2361',2100,80900,,'',0
+'2363',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,5500,,'',0,9800,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107445 b/src/main/res-next/raw/next_gtfs_schedule_stop_107445
new file mode 100644
index 000000000..58cc0c0df
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107445
@@ -0,0 +1,5 @@
+'2357',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13200,,'',0
+'2358',2100,64300,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,11800,,'',0,17300,,'',0,7200,,'',0,5400,,'',0,7900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81100,,'',0
+'2361',2100,81100,,'',0
+'2363',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9900,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107446 b/src/main/res-next/raw/next_gtfs_schedule_stop_107446
new file mode 100644
index 000000000..ca07a292a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107446
@@ -0,0 +1,5 @@
+'2357',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64500,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81300,,'',0
+'2361',2100,81300,,'',0
+'2363',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107447 b/src/main/res-next/raw/next_gtfs_schedule_stop_107447
new file mode 100644
index 000000000..3b1e4eba1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107447
@@ -0,0 +1,5 @@
+'2357',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64600,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81400,,'',0
+'2361',2100,81400,,'',0
+'2363',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107448 b/src/main/res-next/raw/next_gtfs_schedule_stop_107448
new file mode 100644
index 000000000..e5326e4b4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107448
@@ -0,0 +1,5 @@
+'2357',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81500,,'',0
+'2361',2100,81500,,'',0
+'2363',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107449 b/src/main/res-next/raw/next_gtfs_schedule_stop_107449
new file mode 100644
index 000000000..e5326e4b4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107449
@@ -0,0 +1,5 @@
+'2357',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64700,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13300,,'',0,7200,,'',0,9400,,'',0,3900,,'',0,9800,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81500,,'',0
+'2361',2100,81500,,'',0
+'2363',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107450 b/src/main/res-next/raw/next_gtfs_schedule_stop_107450
new file mode 100644
index 000000000..bf047bc19
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107450
@@ -0,0 +1,5 @@
+'2357',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16600,,'',0,13200,,'',0
+'2358',2100,64800,,'',0,7600,,'',0,18900,,'',0,11900,,'',0,11400,,'',0,15800,,'',0,13400,,'',0,20500,,'',0,9700,,'',0,11600,,'',0,15000,,'',0
+'2360',2100,81600,,'',0
+'2361',2100,81600,,'',0
+'2363',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9500,,'',0,9800,,'',0,13100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107451 b/src/main/res-next/raw/next_gtfs_schedule_stop_107451
new file mode 100644
index 000000000..9e33b1594
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107451
@@ -0,0 +1,3 @@
+'2358',2100,151000,,'',0,9400,,'',0
+'2360',2101,73300,,'',0
+'2361',2101,73300,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107452 b/src/main/res-next/raw/next_gtfs_schedule_stop_107452
new file mode 100644
index 000000000..27e48caaa
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107452
@@ -0,0 +1,3 @@
+'2358',2100,151200,,'',0,9400,,'',0
+'2360',2101,73500,,'',0
+'2361',2101,73500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107453 b/src/main/res-next/raw/next_gtfs_schedule_stop_107453
new file mode 100644
index 000000000..53f27e055
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107453
@@ -0,0 +1,3 @@
+'2358',2100,151200,,'',0,9400,,'',0
+'2360',2101,73600,,'',0
+'2361',2101,73600,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107454 b/src/main/res-next/raw/next_gtfs_schedule_stop_107454
new file mode 100644
index 000000000..cce943693
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107454
@@ -0,0 +1,3 @@
+'2358',2100,151400,,'',0,9400,,'',0
+'2360',2101,73800,,'',0
+'2361',2101,73800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107455 b/src/main/res-next/raw/next_gtfs_schedule_stop_107455
new file mode 100644
index 000000000..e38f5c3ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107455
@@ -0,0 +1 @@
+'2358',2100,151600,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107456 b/src/main/res-next/raw/next_gtfs_schedule_stop_107456
new file mode 100644
index 000000000..e38f5c3ea
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107456
@@ -0,0 +1 @@
+'2358',2100,151600,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107457 b/src/main/res-next/raw/next_gtfs_schedule_stop_107457
new file mode 100644
index 000000000..257058114
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107457
@@ -0,0 +1,2 @@
+'2360',2101,73100,,'',0
+'2361',2101,73100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107458 b/src/main/res-next/raw/next_gtfs_schedule_stop_107458
new file mode 100644
index 000000000..cbf671de8
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107458
@@ -0,0 +1,2 @@
+'2360',2101,73200,,'',0
+'2361',2101,73200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107481 b/src/main/res-next/raw/next_gtfs_schedule_stop_107481
new file mode 100644
index 000000000..019a27053
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107481
@@ -0,0 +1,4 @@
+'2357',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2600,80600,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107483 b/src/main/res-next/raw/next_gtfs_schedule_stop_107483
new file mode 100644
index 000000000..5fc47ba99
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107483
@@ -0,0 +1,3 @@
+'2357',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107485 b/src/main/res-next/raw/next_gtfs_schedule_stop_107485
new file mode 100644
index 000000000..25a9e7aee
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107485
@@ -0,0 +1,3 @@
+'2357',3100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,60400,,'',0,3100,,'',0,1200,,'',0,5800,,'',0,1100,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7600,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,5500,,'',0,1300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1500,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85100,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107486 b/src/main/res-next/raw/next_gtfs_schedule_stop_107486
new file mode 100644
index 000000000..d45f98112
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107486
@@ -0,0 +1,3 @@
+'2357',3100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,60500,,'',0,3100,,'',0,1300,,'',0,5700,,'',0,1200,,'',0,1600,,'',0,1400,,'',0,5700,,'',0,1600,,'',0,1400,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,900,,'',0,5500,,'',0,1400,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1300,,'',0,1600,,'',0,2000,,'',0,8000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85200,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3700,,'',0,7300,,'',0,3600,,'',0,7300,,'',0,3700,,'',0,7300,,'',0,7700,,'',0,3300,,'',0,7700,,'',0,3400,,'',0,7700,,'',0,7400,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107487 b/src/main/res-next/raw/next_gtfs_schedule_stop_107487
new file mode 100644
index 000000000..b20cbc3b9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107487
@@ -0,0 +1,3 @@
+'2357',3101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,70600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'2363',3101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107488 b/src/main/res-next/raw/next_gtfs_schedule_stop_107488
new file mode 100644
index 000000000..d1b1951dc
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107488
@@ -0,0 +1,3 @@
+'2357',3101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,70700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
+'2363',3101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107489 b/src/main/res-next/raw/next_gtfs_schedule_stop_107489
new file mode 100644
index 000000000..20e8eda35
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107489
@@ -0,0 +1,3 @@
+'2357',3101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3101,70700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,4500,,'',0,16300,,'',0
+'2363',3101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107490 b/src/main/res-next/raw/next_gtfs_schedule_stop_107490
new file mode 100644
index 000000000..42c9adc7f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107490
@@ -0,0 +1,3 @@
+'2357',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,65500,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107491 b/src/main/res-next/raw/next_gtfs_schedule_stop_107491
new file mode 100644
index 000000000..76361d825
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107491
@@ -0,0 +1,3 @@
+'2357',3100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,65500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107492 b/src/main/res-next/raw/next_gtfs_schedule_stop_107492
new file mode 100644
index 000000000..dd73d3db3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107492
@@ -0,0 +1,3 @@
+'2357',3100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,65600,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
+'2363',3100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107493 b/src/main/res-next/raw/next_gtfs_schedule_stop_107493
new file mode 100644
index 000000000..2a45b1e79
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107493
@@ -0,0 +1,3 @@
+'2357',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2358',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'2363',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107494 b/src/main/res-next/raw/next_gtfs_schedule_stop_107494
new file mode 100644
index 000000000..2a45b1e79
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107494
@@ -0,0 +1,3 @@
+'2357',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2358',701,64000,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
+'2363',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107495 b/src/main/res-next/raw/next_gtfs_schedule_stop_107495
new file mode 100644
index 000000000..a2b245e06
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107495
@@ -0,0 +1,3 @@
+'2357',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2358',701,64100,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
+'2363',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107496 b/src/main/res-next/raw/next_gtfs_schedule_stop_107496
new file mode 100644
index 000000000..63eccba2a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107496
@@ -0,0 +1,3 @@
+'2357',701,62600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2358',701,64100,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
+'2363',701,72700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107498 b/src/main/res-next/raw/next_gtfs_schedule_stop_107498
new file mode 100644
index 000000000..3f8c59c81
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107498
@@ -0,0 +1,5 @@
+'2357',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12800,,'',0,17400,,'',0
+'2358',2101,61100,,'',0,3600,,'',0,18700,,'',0,12000,,'',0,15400,,'',0,11500,,'',0,13000,,'',0,7100,,'',0,8900,,'',0,4500,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
+'2360',2101,73000,,'',0
+'2361',2101,73000,,'',0
+'2363',2101,74700,,'',0,20000,,'',0,15700,,'',0,15400,,'',0,15900,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107499 b/src/main/res-next/raw/next_gtfs_schedule_stop_107499
new file mode 100644
index 000000000..b0b559d5b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107499
@@ -0,0 +1,21 @@
+'2357',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2358',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,800,,'',0,5300,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
+'2357',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
+'2363',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
+'2357',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
+'2358',500,62100,4,'',0,9300,4,'',0,3500,4,'',0,7200,4,'',0,3100,4,'',0,6900,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7700,4,'',0,3600,4,'',0,7600,4,'',0,7500,4,'',0,3800,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,2900,4,'',0,7300,4,'',0,7400,4,'',0,2700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
+'2363',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
+'2357',701,64000,4,'',0,10300,4,'',0,9900,4,'',0,9800,4,'',0,9400,4,'',0,10300,4,'',0,9700,4,'',0,10300,4,'',0,9700,4,'',0,10200,4,'',0,9800,4,'',0,10100,4,'',0,9700,4,'',0,12500,4,'',0
+'2363',701,64200,4,'',0,9900,4,'',0,9900,4,'',0,8800,4,'',0,11400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,14800,4,'',0,10200,4,'',0,10600,4,'',0,10200,4,'',0,10200,4,'',0,10300,4,'',0,10000,4,'',0,12800,4,'',0
+'2357',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
+'2363',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
+'2358',1200,74000,4,'',0,7500,4,'',0,4000,4,'',0,7800,4,'',0,7800,4,'',0,3300,4,'',0,15800,4,'',0,11600,4,'',0,11900,4,'',0,1800,4,'',0,8600,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,3100,4,'',0
+'2357',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16800,,'',0,13400,,'',0
+'2358',2101,60000,,'',0,3600,,'',0,18600,,'',0,12000,,'',0,11300,,'',0,15500,,'',0,12900,,'',0,7000,,'',0,4800,,'',0,8500,,'',0,10300,,'',0,15900,,'',0,11300,,'',0
+'2360',2101,71800,,'',0
+'2361',2101,71800,,'',0
+'2363',2101,73600,,'',0,20000,,'',0,11600,,'',0,19200,,'',0,15900,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,11900,,'',0
+'2358',2400,145900,4,'',0
+'2358',2401,81200,4,'',0
+'2358',2600,82800,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107500 b/src/main/res-next/raw/next_gtfs_schedule_stop_107500
new file mode 100644
index 000000000..8a18aa673
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107500
@@ -0,0 +1,15 @@
+'2357',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2358',201,52900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,9000,,'',0,2400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9200,,'',0,1800,,'',0,800,4,'',0,5200,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'2360',201,104000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,104000,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'2357',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,55900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
+'2363',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'2357',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2358',601,55500,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,23500,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
+'2360',601,85500,,'',0,8000,,'',0
+'2361',601,85500,,'',0,8000,,'',0
+'2363',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'2358',2400,142000,0,'Ctr Loop',0
+'2358',2401,73900,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107501 b/src/main/res-next/raw/next_gtfs_schedule_stop_107501
new file mode 100644
index 000000000..0c77eb647
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107501
@@ -0,0 +1,7 @@
+'2358',1701,62600,,'',0,3200,,'',0,8700,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
+'2358',2201,144300,,'',0
+'2360',2201,83500,,'',0
+'2361',2201,80500,,'',0
+'2357',3100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2358',3100,55800,,'',0,7100,,'',0,1200,,'',0,1800,,'',0,5100,,'',0,1700,,'',0,1300,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7400,,'',0,7100,,'',0,3800,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,3200,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,900,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,1100,,'',0,6000,,'',0,1300,,'',0,1600,,'',0,2100,,'',0,7900,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
+'2363',3100,84500,,'',0,7300,,'',0,2900,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7200,,'',0,3700,,'',0,7200,,'',0,3800,,'',0,7200,,'',0,7800,,'',0,3200,,'',0,7800,,'',0,3300,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107740 b/src/main/res-next/raw/next_gtfs_schedule_stop_107740
new file mode 100644
index 000000000..a5d68cd37
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107740
@@ -0,0 +1,10 @@
+'2357',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12700,,'',0,17300,,'',0
+'2357',2101,92100,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
+'2358',2100,63400,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2358',2101,62400,,'',0,7600,,'',0,14800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17200,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'2360',2100,80200,,'',0
+'2360',2101,75100,,'',0
+'2361',2100,80200,,'',0
+'2361',2101,75100,,'',0
+'2363',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9500,,'',0,9900,,'',0,17100,,'',0
+'2363',2101,75900,,'',0,20000,,'',0,15900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107742 b/src/main/res-next/raw/next_gtfs_schedule_stop_107742
new file mode 100644
index 000000000..222769bf4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107742
@@ -0,0 +1,5 @@
+'2357',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
+'2358',2101,62600,,'',0,7600,,'',0,14800,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17200,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
+'2360',2101,75300,,'',0
+'2361',2101,75300,,'',0
+'2363',2101,80100,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107744 b/src/main/res-next/raw/next_gtfs_schedule_stop_107744
new file mode 100644
index 000000000..9793f25fe
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107744
@@ -0,0 +1,5 @@
+'2357',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17300,,'',0
+'2358',2101,62700,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11600,,'',0,17100,,'',0,3200,,'',0,8900,,'',0,8400,,'',0,10000,,'',0,11800,,'',0,11000,,'',0
+'2360',2101,75500,,'',0
+'2361',2101,75500,,'',0
+'2363',2101,80300,,'',0,20000,,'',0,11800,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,15900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107746 b/src/main/res-next/raw/next_gtfs_schedule_stop_107746
new file mode 100644
index 000000000..169fb08c1
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107746
@@ -0,0 +1,10 @@
+'2357',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
+'2357',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12700,4,'',0,17300,4,'',0
+'2358',2100,63200,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2358',2101,62900,4,'',0,7600,4,'',0,14900,4,'',0,15900,4,'',0,11400,4,'',0,11600,4,'',0,17200,4,'',0,3200,4,'',0,8900,4,'',0,8400,4,'',0,9900,4,'',0,11800,4,'',0,11000,4,'',0
+'2360',2100,80000,,'',0
+'2360',2101,75700,4,'',0
+'2361',2100,80000,,'',0
+'2361',2101,75700,4,'',0
+'2363',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
+'2363',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19400,4,'',0,11900,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,15800,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107747 b/src/main/res-next/raw/next_gtfs_schedule_stop_107747
new file mode 100644
index 000000000..69402fea9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107747
@@ -0,0 +1,5 @@
+'2357',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12700,,'',0,17300,,'',0
+'2358',2100,63300,,'',0,7600,,'',0,14900,,'',0,15900,,'',0,11400,,'',0,11800,,'',0,17200,,'',0,3200,,'',0,9400,,'',0,7900,,'',0,9800,,'',0,11700,,'',0,11000,,'',0
+'2360',2100,80100,,'',0
+'2361',2100,80100,,'',0
+'2363',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,17100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107751 b/src/main/res-next/raw/next_gtfs_schedule_stop_107751
new file mode 100644
index 000000000..366c6c87e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107751
@@ -0,0 +1,19 @@
+'2358',3100,95500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0
+'2358',3101,171100,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
+'2363',3100,91000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'2357',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,95700,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,11400,,'',0,48500,,'',0
+'2358',3201,171100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
+'2363',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0
+'2357',3300,190700,,'',0
+'2358',3300,61700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,51300,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,10600,,'',0,9900,,'',0
+'2358',3301,170900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
+'2363',3300,195700,,'',0,14500,,'',0
+'2358',3400,61800,,'',0,3000,,'',0,7000,,'',0,79400,,'',0,59100,,'',0
+'2358',3401,170900,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
+'2357',3500,95100,,'',0,30300,,'',0,59700,,'',0
+'2358',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
+'2363',3500,84200,,'',0,67200,,'',0,22000,,'',0
+'2357',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
+'2358',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
+'2363',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107752 b/src/main/res-next/raw/next_gtfs_schedule_stop_107752
new file mode 100644
index 000000000..5d1243126
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107752
@@ -0,0 +1,9 @@
+'2357',3101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,62600,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,6000,,'',0,1700,,'',0,2800,,'',0,8500,,'',0,16200,,'',0,11000,,'',0
+'2363',3101,81600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
+'2357',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'2358',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107754 b/src/main/res-next/raw/next_gtfs_schedule_stop_107754
new file mode 100644
index 000000000..e67213d22
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107754
@@ -0,0 +1,6 @@
+'2357',3100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
+'2357',3101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,70100,,'',0,3000,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
+'2358',3101,63200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,6000,,'',0,1200,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,2000,,'',0,1200,,'',0,1700,,'',0,5200,,'',0,1900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
+'2363',3100,90400,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'2363',3101,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107755 b/src/main/res-next/raw/next_gtfs_schedule_stop_107755
new file mode 100644
index 000000000..592d373b3
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107755
@@ -0,0 +1,9 @@
+'2357',3100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,61600,,'',0,3100,,'',0,5700,,'',0,1400,,'',0,1600,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
+'2363',3100,90700,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
+'2357',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,61600,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'2363',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
+'2357',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
+'2358',3300,61400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107756 b/src/main/res-next/raw/next_gtfs_schedule_stop_107756
new file mode 100644
index 000000000..45571fd05
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107756
@@ -0,0 +1,20 @@
+'2357',3100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,61700,,'',0,3100,,'',0,5800,,'',0,1300,,'',0,1700,,'',0,1300,,'',0,5800,,'',0,1300,,'',0,1800,,'',0,1200,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7600,,'',0,1700,,'',0,2000,,'',0,1300,,'',0,4900,,'',0,1500,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1300,,'',0,1800,,'',0,5700,,'',0,4200,,'',0,7600,,'',0,11400,,'',0,11400,,'',0,14900,,'',0
+'2358',3101,171000,,'',0,3000,,'',0,7200,,'',0,4500,,'',0,8500,,'',0
+'2363',3100,90900,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
+'2357',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,61800,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'2358',3201,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
+'2363',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
+'2357',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
+'2358',3300,61600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0
+'2358',3301,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
+'2363',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
+'2358',3400,61700,,'',0,3000,,'',0,7000,,'',0,30600,,'',0,48800,,'',0,59100,,'',0,5700,,'',0
+'2358',3401,171000,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
+'2357',3501,93300,,'',0,30300,,'',0,59800,,'',0
+'2358',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2363',3501,82500,,'',0,63100,,'',0,26000,,'',0
+'2357',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'2358',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107758 b/src/main/res-next/raw/next_gtfs_schedule_stop_107758
new file mode 100644
index 000000000..d50f23625
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107758
@@ -0,0 +1,3 @@
+'2357',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,55900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107759 b/src/main/res-next/raw/next_gtfs_schedule_stop_107759
new file mode 100644
index 000000000..75d597f73
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107759
@@ -0,0 +1,6 @@
+'2357',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107761 b/src/main/res-next/raw/next_gtfs_schedule_stop_107761
new file mode 100644
index 000000000..6d7276ff7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107761
@@ -0,0 +1,6 @@
+'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107762 b/src/main/res-next/raw/next_gtfs_schedule_stop_107762
new file mode 100644
index 000000000..a7724d650
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107762
@@ -0,0 +1,6 @@
+'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107763 b/src/main/res-next/raw/next_gtfs_schedule_stop_107763
new file mode 100644
index 000000000..aaafe753d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107763
@@ -0,0 +1,6 @@
+'2357',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107764 b/src/main/res-next/raw/next_gtfs_schedule_stop_107764
new file mode 100644
index 000000000..f1dc15493
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107764
@@ -0,0 +1,6 @@
+'2357',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107765 b/src/main/res-next/raw/next_gtfs_schedule_stop_107765
new file mode 100644
index 000000000..42bd5248d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107765
@@ -0,0 +1,6 @@
+'2357',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107766 b/src/main/res-next/raw/next_gtfs_schedule_stop_107766
new file mode 100644
index 000000000..c5ae24c53
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107766
@@ -0,0 +1,6 @@
+'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107767 b/src/main/res-next/raw/next_gtfs_schedule_stop_107767
new file mode 100644
index 000000000..ab910a95c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107767
@@ -0,0 +1,3 @@
+'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107768 b/src/main/res-next/raw/next_gtfs_schedule_stop_107768
new file mode 100644
index 000000000..ab910a95c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107768
@@ -0,0 +1,3 @@
+'2357',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107769 b/src/main/res-next/raw/next_gtfs_schedule_stop_107769
new file mode 100644
index 000000000..608d7178d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107769
@@ -0,0 +1,3 @@
+'2357',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107770 b/src/main/res-next/raw/next_gtfs_schedule_stop_107770
new file mode 100644
index 000000000..206f4052d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107770
@@ -0,0 +1,3 @@
+'2357',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107771 b/src/main/res-next/raw/next_gtfs_schedule_stop_107771
new file mode 100644
index 000000000..cf94887d4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107771
@@ -0,0 +1,3 @@
+'2357',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107772 b/src/main/res-next/raw/next_gtfs_schedule_stop_107772
new file mode 100644
index 000000000..cf94887d4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107772
@@ -0,0 +1,3 @@
+'2357',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107773 b/src/main/res-next/raw/next_gtfs_schedule_stop_107773
new file mode 100644
index 000000000..0584a2d92
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107773
@@ -0,0 +1,6 @@
+'2357',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2357',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'2358',3200,60800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2358',3201,60800,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7900,4,'',0,7700,4,'',0,3400,4,'',0,8000,4,'',0,7400,4,'',0,3700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,9200,4,'',0,10800,4,'',0
+'2363',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2363',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107774 b/src/main/res-next/raw/next_gtfs_schedule_stop_107774
new file mode 100644
index 000000000..d2597b567
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107774
@@ -0,0 +1,3 @@
+'2357',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3200,60900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107775 b/src/main/res-next/raw/next_gtfs_schedule_stop_107775
new file mode 100644
index 000000000..95878467c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107775
@@ -0,0 +1,3 @@
+'2357',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107776 b/src/main/res-next/raw/next_gtfs_schedule_stop_107776
new file mode 100644
index 000000000..b3f39c220
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107776
@@ -0,0 +1,3 @@
+'2357',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107777 b/src/main/res-next/raw/next_gtfs_schedule_stop_107777
new file mode 100644
index 000000000..f65fa5341
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107777
@@ -0,0 +1,3 @@
+'2357',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,61100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107778 b/src/main/res-next/raw/next_gtfs_schedule_stop_107778
new file mode 100644
index 000000000..367a9f35a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107778
@@ -0,0 +1,3 @@
+'2357',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3200,61200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'2363',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107779 b/src/main/res-next/raw/next_gtfs_schedule_stop_107779
new file mode 100644
index 000000000..e709d3d8c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107779
@@ -0,0 +1,3 @@
+'2357',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,61200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107781 b/src/main/res-next/raw/next_gtfs_schedule_stop_107781
new file mode 100644
index 000000000..f26078f74
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107781
@@ -0,0 +1,3 @@
+'2357',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107783 b/src/main/res-next/raw/next_gtfs_schedule_stop_107783
new file mode 100644
index 000000000..96546109b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107783
@@ -0,0 +1,3 @@
+'2357',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'2358',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107786 b/src/main/res-next/raw/next_gtfs_schedule_stop_107786
new file mode 100644
index 000000000..36c78264b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107786
@@ -0,0 +1,3 @@
+'2357',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107787 b/src/main/res-next/raw/next_gtfs_schedule_stop_107787
new file mode 100644
index 000000000..e6fd4ce59
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107787
@@ -0,0 +1,6 @@
+'2357',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
+'2363',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'2357',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2363',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107788 b/src/main/res-next/raw/next_gtfs_schedule_stop_107788
new file mode 100644
index 000000000..f079a452f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107788
@@ -0,0 +1,6 @@
+'2357',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'2357',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107789 b/src/main/res-next/raw/next_gtfs_schedule_stop_107789
new file mode 100644
index 000000000..f079a452f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107789
@@ -0,0 +1,6 @@
+'2357',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'2357',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107790 b/src/main/res-next/raw/next_gtfs_schedule_stop_107790
new file mode 100644
index 000000000..60e41bdd9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107790
@@ -0,0 +1,3 @@
+'2357',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107791 b/src/main/res-next/raw/next_gtfs_schedule_stop_107791
new file mode 100644
index 000000000..0d9bbded9
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107791
@@ -0,0 +1,3 @@
+'2357',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107792 b/src/main/res-next/raw/next_gtfs_schedule_stop_107792
new file mode 100644
index 000000000..a12b2a027
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107792
@@ -0,0 +1,3 @@
+'2357',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107793 b/src/main/res-next/raw/next_gtfs_schedule_stop_107793
new file mode 100644
index 000000000..a38e133e7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107793
@@ -0,0 +1,3 @@
+'2357',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,60100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107794 b/src/main/res-next/raw/next_gtfs_schedule_stop_107794
new file mode 100644
index 000000000..632376222
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107794
@@ -0,0 +1,6 @@
+'2357',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'2357',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107795 b/src/main/res-next/raw/next_gtfs_schedule_stop_107795
new file mode 100644
index 000000000..3967c7d3e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107795
@@ -0,0 +1,3 @@
+'2357',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2358',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107796 b/src/main/res-next/raw/next_gtfs_schedule_stop_107796
new file mode 100644
index 000000000..72a09793e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107796
@@ -0,0 +1,3 @@
+'2357',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107797 b/src/main/res-next/raw/next_gtfs_schedule_stop_107797
new file mode 100644
index 000000000..afe1524da
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107797
@@ -0,0 +1,3 @@
+'2357',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2358',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107798 b/src/main/res-next/raw/next_gtfs_schedule_stop_107798
new file mode 100644
index 000000000..7830b43da
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107798
@@ -0,0 +1,3 @@
+'2357',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2358',3301,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107800 b/src/main/res-next/raw/next_gtfs_schedule_stop_107800
new file mode 100644
index 000000000..7bac74e06
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107800
@@ -0,0 +1,3 @@
+'2357',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2358',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107801 b/src/main/res-next/raw/next_gtfs_schedule_stop_107801
new file mode 100644
index 000000000..78099ea92
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107801
@@ -0,0 +1,3 @@
+'2357',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
+'2358',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107802 b/src/main/res-next/raw/next_gtfs_schedule_stop_107802
new file mode 100644
index 000000000..a8b75cadd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107802
@@ -0,0 +1,3 @@
+'2357',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2358',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107803 b/src/main/res-next/raw/next_gtfs_schedule_stop_107803
new file mode 100644
index 000000000..215cbaa27
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107803
@@ -0,0 +1,3 @@
+'2357',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'2358',3300,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107804 b/src/main/res-next/raw/next_gtfs_schedule_stop_107804
new file mode 100644
index 000000000..3426fbd2a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107804
@@ -0,0 +1,3 @@
+'2357',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
+'2358',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107805 b/src/main/res-next/raw/next_gtfs_schedule_stop_107805
new file mode 100644
index 000000000..b19dc0c32
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107805
@@ -0,0 +1,3 @@
+'2357',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'2358',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107806 b/src/main/res-next/raw/next_gtfs_schedule_stop_107806
new file mode 100644
index 000000000..cba3521ed
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107806
@@ -0,0 +1,3 @@
+'2357',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'2358',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107807 b/src/main/res-next/raw/next_gtfs_schedule_stop_107807
new file mode 100644
index 000000000..f72c904c4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107807
@@ -0,0 +1,3 @@
+'2357',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
+'2358',3300,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107817 b/src/main/res-next/raw/next_gtfs_schedule_stop_107817
new file mode 100644
index 000000000..23098fd68
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107817
@@ -0,0 +1,3 @@
+'2357',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107818 b/src/main/res-next/raw/next_gtfs_schedule_stop_107818
new file mode 100644
index 000000000..06309edcb
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107818
@@ -0,0 +1,3 @@
+'2357',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107819 b/src/main/res-next/raw/next_gtfs_schedule_stop_107819
new file mode 100644
index 000000000..6a76e0185
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107819
@@ -0,0 +1,8 @@
+'2357',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
+'2363',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'2357',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3400,95300,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0
+'2358',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
+'2363',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107820 b/src/main/res-next/raw/next_gtfs_schedule_stop_107820
new file mode 100644
index 000000000..bbcd265d4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107820
@@ -0,0 +1,3 @@
+'2357',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107822 b/src/main/res-next/raw/next_gtfs_schedule_stop_107822
new file mode 100644
index 000000000..3f94f284e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107822
@@ -0,0 +1,3 @@
+'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107823 b/src/main/res-next/raw/next_gtfs_schedule_stop_107823
new file mode 100644
index 000000000..cf2ce874c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107823
@@ -0,0 +1,3 @@
+'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107824 b/src/main/res-next/raw/next_gtfs_schedule_stop_107824
new file mode 100644
index 000000000..09429314e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107824
@@ -0,0 +1,3 @@
+'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
+'2363',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107825 b/src/main/res-next/raw/next_gtfs_schedule_stop_107825
new file mode 100644
index 000000000..b8951e6df
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107825
@@ -0,0 +1,3 @@
+'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107826 b/src/main/res-next/raw/next_gtfs_schedule_stop_107826
new file mode 100644
index 000000000..5dc4c9d0d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107826
@@ -0,0 +1,3 @@
+'2357',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107827 b/src/main/res-next/raw/next_gtfs_schedule_stop_107827
new file mode 100644
index 000000000..52132bc29
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107827
@@ -0,0 +1,3 @@
+'2357',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107828 b/src/main/res-next/raw/next_gtfs_schedule_stop_107828
new file mode 100644
index 000000000..5630a8cc2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107828
@@ -0,0 +1,3 @@
+'2357',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107829 b/src/main/res-next/raw/next_gtfs_schedule_stop_107829
new file mode 100644
index 000000000..04114f753
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107829
@@ -0,0 +1,3 @@
+'2357',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107830 b/src/main/res-next/raw/next_gtfs_schedule_stop_107830
new file mode 100644
index 000000000..9c8617678
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107830
@@ -0,0 +1,3 @@
+'2357',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107831 b/src/main/res-next/raw/next_gtfs_schedule_stop_107831
new file mode 100644
index 000000000..05f652256
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107831
@@ -0,0 +1,3 @@
+'2357',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3401,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107832 b/src/main/res-next/raw/next_gtfs_schedule_stop_107832
new file mode 100644
index 000000000..4bed60a27
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107832
@@ -0,0 +1,3 @@
+'2357',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107833 b/src/main/res-next/raw/next_gtfs_schedule_stop_107833
new file mode 100644
index 000000000..a90453cb4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107833
@@ -0,0 +1,3 @@
+'2357',3401,82700,,'',0,17400,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,75400,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107834 b/src/main/res-next/raw/next_gtfs_schedule_stop_107834
new file mode 100644
index 000000000..45faaa1d0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107834
@@ -0,0 +1,6 @@
+'2357',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2357',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
+'2358',3400,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2358',3401,60500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,4000,4,'',0,7400,4,'',0,7800,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,3900,4,'',0,9700,4,'',0,9700,4,'',0
+'2363',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'2363',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107835 b/src/main/res-next/raw/next_gtfs_schedule_stop_107835
new file mode 100644
index 000000000..9df62da34
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107835
@@ -0,0 +1,3 @@
+'2357',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107836 b/src/main/res-next/raw/next_gtfs_schedule_stop_107836
new file mode 100644
index 000000000..808589771
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107836
@@ -0,0 +1,3 @@
+'2357',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107838 b/src/main/res-next/raw/next_gtfs_schedule_stop_107838
new file mode 100644
index 000000000..04bb75af2
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107838
@@ -0,0 +1,3 @@
+'2357',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107839 b/src/main/res-next/raw/next_gtfs_schedule_stop_107839
new file mode 100644
index 000000000..44fc99f79
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107839
@@ -0,0 +1,3 @@
+'2357',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107840 b/src/main/res-next/raw/next_gtfs_schedule_stop_107840
new file mode 100644
index 000000000..890afdb19
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107840
@@ -0,0 +1,3 @@
+'2357',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107841 b/src/main/res-next/raw/next_gtfs_schedule_stop_107841
new file mode 100644
index 000000000..5f11a3281
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107841
@@ -0,0 +1,3 @@
+'2357',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107842 b/src/main/res-next/raw/next_gtfs_schedule_stop_107842
new file mode 100644
index 000000000..a7d16ab77
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107842
@@ -0,0 +1,3 @@
+'2357',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107843 b/src/main/res-next/raw/next_gtfs_schedule_stop_107843
new file mode 100644
index 000000000..403e3c2ae
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107843
@@ -0,0 +1,3 @@
+'2357',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2363',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107844 b/src/main/res-next/raw/next_gtfs_schedule_stop_107844
new file mode 100644
index 000000000..b8f42da91
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107844
@@ -0,0 +1,3 @@
+'2357',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2363',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107845 b/src/main/res-next/raw/next_gtfs_schedule_stop_107845
new file mode 100644
index 000000000..510837551
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107845
@@ -0,0 +1,3 @@
+'2357',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2363',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107846 b/src/main/res-next/raw/next_gtfs_schedule_stop_107846
new file mode 100644
index 000000000..510837551
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107846
@@ -0,0 +1,3 @@
+'2357',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2363',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107847 b/src/main/res-next/raw/next_gtfs_schedule_stop_107847
new file mode 100644
index 000000000..33094a8b0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107847
@@ -0,0 +1,3 @@
+'2357',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
+'2363',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107849 b/src/main/res-next/raw/next_gtfs_schedule_stop_107849
new file mode 100644
index 000000000..fd3ae9fbd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107849
@@ -0,0 +1,3 @@
+'2357',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107850 b/src/main/res-next/raw/next_gtfs_schedule_stop_107850
new file mode 100644
index 000000000..cfcbff403
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107850
@@ -0,0 +1,3 @@
+'2357',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107851 b/src/main/res-next/raw/next_gtfs_schedule_stop_107851
new file mode 100644
index 000000000..f7aacbcd4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107851
@@ -0,0 +1,3 @@
+'2357',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107855 b/src/main/res-next/raw/next_gtfs_schedule_stop_107855
new file mode 100644
index 000000000..dc1b4d353
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107855
@@ -0,0 +1,6 @@
+'2357',3500,93900,,'',0,30300,,'',0,59700,,'',0
+'2357',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
+'2358',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2358',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
+'2363',3500,83000,,'',0,67200,,'',0,22000,,'',0
+'2363',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107856 b/src/main/res-next/raw/next_gtfs_schedule_stop_107856
new file mode 100644
index 000000000..592226f42
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107856
@@ -0,0 +1,3 @@
+'2357',3500,94300,,'',0,30300,,'',0,59700,,'',0
+'2358',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2363',3500,83400,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107857 b/src/main/res-next/raw/next_gtfs_schedule_stop_107857
new file mode 100644
index 000000000..fff859fbe
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107857
@@ -0,0 +1,3 @@
+'2357',3500,94500,,'',0,30300,,'',0,59700,,'',0
+'2358',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2363',3500,83600,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107859 b/src/main/res-next/raw/next_gtfs_schedule_stop_107859
new file mode 100644
index 000000000..21a29e08e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107859
@@ -0,0 +1,3 @@
+'2357',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107861 b/src/main/res-next/raw/next_gtfs_schedule_stop_107861
new file mode 100644
index 000000000..d98fe0b99
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107861
@@ -0,0 +1,3 @@
+'2357',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107870 b/src/main/res-next/raw/next_gtfs_schedule_stop_107870
new file mode 100644
index 000000000..e2b2e0c8c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107870
@@ -0,0 +1,6 @@
+'2357',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2358',3200,61300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
+'2363',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107871 b/src/main/res-next/raw/next_gtfs_schedule_stop_107871
new file mode 100644
index 000000000..43a699b8b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107871
@@ -0,0 +1,6 @@
+'2357',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3200,61400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
+'2363',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
+'2357',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107877 b/src/main/res-next/raw/next_gtfs_schedule_stop_107877
new file mode 100644
index 000000000..a34b6a5dd
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107877
@@ -0,0 +1,3 @@
+'2357',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107880 b/src/main/res-next/raw/next_gtfs_schedule_stop_107880
new file mode 100644
index 000000000..6d7276ff7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107880
@@ -0,0 +1,6 @@
+'2357',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2358',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107883 b/src/main/res-next/raw/next_gtfs_schedule_stop_107883
new file mode 100644
index 000000000..7fb491949
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107883
@@ -0,0 +1,6 @@
+'2357',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2363',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'2357',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2358',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8200,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
+'2363',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_107884 b/src/main/res-next/raw/next_gtfs_schedule_stop_107884
new file mode 100644
index 000000000..c2b18ee2c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_107884
@@ -0,0 +1,3 @@
+'2357',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
+'2363',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_108262 b/src/main/res-next/raw/next_gtfs_schedule_stop_108262
new file mode 100644
index 000000000..58621e5b4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_108262
@@ -0,0 +1,22 @@
+'2357',100,62100,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,4700,0,'UFV',0,8600,0,'UFV',0,8900,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,8900,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54100,0,'UFV',0,8200,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,2600,0,'UFV',0,6200,0,'UFV',0,2000,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6600,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,62400,0,'UFV',0,3100,0,'UFV',0,7900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7300,0,'UFV',0,3100,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6700,0,'UFV',0,2600,0,'UFV',0
+'2357',200,63900,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,55600,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2200,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,113800,0,'McMillan',0,18000,0,'McMillan',0,18900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,62100,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,55300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2363',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'2363',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'2357',700,60000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2363',700,60000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,5500,0,'To McMillan',0,9000,0,'Sumas Mtn',0,11000,0,'To McMillan',0,14500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2357',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2363',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
+'2358',2601,73100,,'',0,68400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120002 b/src/main/res-next/raw/next_gtfs_schedule_stop_120002
new file mode 100644
index 000000000..53e9ed6db
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120002
@@ -0,0 +1,16 @@
+'2357',100,60500,0,'UFV',0,3600,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,5000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,8800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2357',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
+'2358',100,52400,0,'UFV',0,8000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,800,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,2400,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2358',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,2800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6000,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2100,4,'',0,6000,4,'',0,800,4,'',0,1300,4,'',0,2100,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2600,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0
+'2363',100,60700,0,'UFV',0,3000,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6700,0,'UFV',0
+'2363',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
+'2357',200,61700,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8500,0,'McMillan',0,8500,0,'McMillan',0,4600,0,'McMillan',0,8500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4300,0,'McMillan',0
+'2357',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
+'2358',200,53500,0,'McMillan',0,2200,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6700,0,'McMillan',0,2100,0,'McMillan',0,5800,0,'McMillan',0,2000,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,1900,0,'McMillan',0,5500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2358',201,55300,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,9700,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5500,4,'',0,3900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2300,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,3000,4,'',0
+'2360',200,111000,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
+'2360',201,110800,4,'',0,14000,4,'',0,18200,4,'',0,20000,4,'',0
+'2361',200,111000,0,'McMillan',0,14000,0,'McMillan',0,18200,0,'McMillan',0,20000,0,'McMillan',0
+'2361',201,110800,4,'',0,14000,4,'',0,18200,4,'',0,20000,4,'',0
+'2363',200,60000,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
+'2363',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120006 b/src/main/res-next/raw/next_gtfs_schedule_stop_120006
new file mode 100644
index 000000000..9ea9a5c3d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120006
@@ -0,0 +1,3 @@
+'2358',1501,62100,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
+'2363',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'2358',2600,81300,,'',0,63700,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120007 b/src/main/res-next/raw/next_gtfs_schedule_stop_120007
new file mode 100644
index 000000000..7bcd86622
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120007
@@ -0,0 +1,9 @@
+'2357',3101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,62800,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1400,,'',0,1800,,'',0,5500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,6000,,'',0,1200,,'',0,1800,,'',0,1200,,'',0,5900,,'',0,1800,,'',0,6700,,'',0,4500,,'',0,16300,,'',0,10900,,'',0
+'2363',3101,81800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'2357',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3201,55800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
+'2363',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'2358',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120011 b/src/main/res-next/raw/next_gtfs_schedule_stop_120011
new file mode 100644
index 000000000..11d758587
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120011
@@ -0,0 +1 @@
+'2358',1601,80500,,'',0,11900,,'',0,68500,,'',0,4500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120012 b/src/main/res-next/raw/next_gtfs_schedule_stop_120012
new file mode 100644
index 000000000..ee16a4a95
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120012
@@ -0,0 +1,3 @@
+'2358',2201,150600,,'',0
+'2360',2201,85200,,'',0
+'2361',2201,82200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120013 b/src/main/res-next/raw/next_gtfs_schedule_stop_120013
new file mode 100644
index 000000000..31cb25e33
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120013
@@ -0,0 +1,2 @@
+'2358',3100,61000,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,3300,,'',0,900,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
+'2363',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120014 b/src/main/res-next/raw/next_gtfs_schedule_stop_120014
new file mode 100644
index 000000000..1ccf7b0ba
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120014
@@ -0,0 +1,3 @@
+'2357',3101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3101,63800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1700,,'',0,1400,,'',0,1900,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,1500,,'',0,5900,,'',0,1200,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1900,,'',0,1300,,'',0,1600,,'',0,5200,,'',0,1800,,'',0,1800,,'',0,6800,,'',0,4500,,'',0,16300,,'',0,10800,,'',0
+'2363',3101,82700,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120016 b/src/main/res-next/raw/next_gtfs_schedule_stop_120016
new file mode 100644
index 000000000..1f8cdfe96
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120016
@@ -0,0 +1,3 @@
+'2358',1500,64400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'2358',2601,75700,,'',0,67500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120017 b/src/main/res-next/raw/next_gtfs_schedule_stop_120017
new file mode 100644
index 000000000..1c0ebf064
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120017
@@ -0,0 +1 @@
+'2358',2600,145400,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120018 b/src/main/res-next/raw/next_gtfs_schedule_stop_120018
new file mode 100644
index 000000000..1f8bff70b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120018
@@ -0,0 +1 @@
+'2358',2400,142300,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120022 b/src/main/res-next/raw/next_gtfs_schedule_stop_120022
new file mode 100644
index 000000000..c02ecf7ff
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120022
@@ -0,0 +1,3 @@
+'2357',701,63000,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,64600,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,3400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,14700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'2363',701,63200,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120023 b/src/main/res-next/raw/next_gtfs_schedule_stop_120023
new file mode 100644
index 000000000..ef9d8377c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120023
@@ -0,0 +1,13 @@
+'2357',200,63100,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9300,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4800,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,54800,0,'McMillan',0,6300,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,5000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6600,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,5900,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112700,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2361',200,112700,0,'McMillan',0,18000,0,'McMillan',0,14900,0,'McMillan',0,19400,0,'McMillan',0
+'2363',200,61400,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
+'2357',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2358',301,60600,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
+'2363',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'2357',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2358',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,27300,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
+'2360',601,91700,,'',0,4000,,'',0
+'2361',601,91700,,'',0,4000,,'',0
+'2363',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120024 b/src/main/res-next/raw/next_gtfs_schedule_stop_120024
new file mode 100644
index 000000000..407ca0783
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120024
@@ -0,0 +1,4 @@
+'2357',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2358',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'2358',1200,73300,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,1800,,'',0,8800,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120026 b/src/main/res-next/raw/next_gtfs_schedule_stop_120026
new file mode 100644
index 000000000..05c192d11
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120026
@@ -0,0 +1,2 @@
+'2358',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120027 b/src/main/res-next/raw/next_gtfs_schedule_stop_120027
new file mode 100644
index 000000000..05c192d11
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120027
@@ -0,0 +1,2 @@
+'2358',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120028 b/src/main/res-next/raw/next_gtfs_schedule_stop_120028
new file mode 100644
index 000000000..bc53b3fd7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120028
@@ -0,0 +1,2 @@
+'2358',1500,63800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
+'2363',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120031 b/src/main/res-next/raw/next_gtfs_schedule_stop_120031
new file mode 100644
index 000000000..bf226661a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120031
@@ -0,0 +1,3 @@
+'2357',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'2358',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120032 b/src/main/res-next/raw/next_gtfs_schedule_stop_120032
new file mode 100644
index 000000000..e73a33b5d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120032
@@ -0,0 +1 @@
+'2358',2401,80800,0,'Ctr Loop',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120033 b/src/main/res-next/raw/next_gtfs_schedule_stop_120033
new file mode 100644
index 000000000..207b6ea82
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120033
@@ -0,0 +1,5 @@
+'2357',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,110200,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,110200,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120034 b/src/main/res-next/raw/next_gtfs_schedule_stop_120034
new file mode 100644
index 000000000..5183b4490
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120034
@@ -0,0 +1,5 @@
+'2357',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,110300,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,110300,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120035 b/src/main/res-next/raw/next_gtfs_schedule_stop_120035
new file mode 100644
index 000000000..800e01920
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120035
@@ -0,0 +1,5 @@
+'2357',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'2358',201,55100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,110500,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,110500,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120037 b/src/main/res-next/raw/next_gtfs_schedule_stop_120037
new file mode 100644
index 000000000..1653a390a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120037
@@ -0,0 +1,5 @@
+'2357',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105700,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105700,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120038 b/src/main/res-next/raw/next_gtfs_schedule_stop_120038
new file mode 100644
index 000000000..f6e5d3a30
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120038
@@ -0,0 +1,5 @@
+'2357',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54200,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2800,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6100,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18700,0,'McMillan',0,19500,0,'McMillan',0
+'2361',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18700,0,'McMillan',0,19500,0,'McMillan',0
+'2363',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120039 b/src/main/res-next/raw/next_gtfs_schedule_stop_120039
new file mode 100644
index 000000000..494b00364
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120039
@@ -0,0 +1,5 @@
+'2357',200,62500,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54200,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111900,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111900,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60800,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120040 b/src/main/res-next/raw/next_gtfs_schedule_stop_120040
new file mode 100644
index 000000000..28c884a1a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120040
@@ -0,0 +1,5 @@
+'2357',200,62600,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,4900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54300,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,112000,0,'McMillan',0,18000,0,'McMillan',0,14600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60900,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120041 b/src/main/res-next/raw/next_gtfs_schedule_stop_120041
new file mode 100644
index 000000000..26b93b8e7
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120041
@@ -0,0 +1,5 @@
+'2357',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2358',201,54000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5000,,'',0,6500,,'',0,2500,,'',0,9600,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,7900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105300,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2361',201,105300,,'',0,18000,,'',0,18100,,'',0,20000,,'',0
+'2363',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120042 b/src/main/res-next/raw/next_gtfs_schedule_stop_120042
new file mode 100644
index 000000000..696582d46
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120042
@@ -0,0 +1,5 @@
+'2357',200,62300,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54100,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111700,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111700,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60600,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120043 b/src/main/res-next/raw/next_gtfs_schedule_stop_120043
new file mode 100644
index 000000000..a75ee756a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120043
@@ -0,0 +1,10 @@
+'2357',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
+'2357',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',200,60700,4,'',0,2300,4,'',0,7100,4,'',0,3400,4,'',0,6800,4,'',0,2200,4,'',0,2100,4,'',0,5700,4,'',0,1800,4,'',0,2100,4,'',0,5900,4,'',0,2000,4,'',0,2200,4,'',0,5800,4,'',0,2500,4,'',0,9000,4,'',0,2500,4,'',0,6500,4,'',0,5000,4,'',0,6700,4,'',0,2700,4,'',0,9500,4,'',0,5800,4,'',0,1800,4,'',0,2000,4,'',0,1500,4,'',0,7800,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6800,4,'',0,2900,4,'',0
+'2358',201,51300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,8900,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5700,,'',0,1700,,'',0,4000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',200,115100,4,'',0,18000,4,'',0,19100,4,'',0,19400,4,'',0
+'2360',201,102200,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2361',200,115100,4,'',0,18000,4,'',0,19100,4,'',0,19400,4,'',0
+'2361',201,102200,,'',0,17800,,'',0,14000,,'',0,19800,,'',0
+'2363',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
+'2363',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120044 b/src/main/res-next/raw/next_gtfs_schedule_stop_120044
new file mode 100644
index 000000000..324b78075
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120044
@@ -0,0 +1,5 @@
+'2357',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2358',201,54500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,2500,,'',0,9700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,105900,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,105900,,'',0,18000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120045 b/src/main/res-next/raw/next_gtfs_schedule_stop_120045
new file mode 100644
index 000000000..5bec2058f
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120045
@@ -0,0 +1,5 @@
+'2357',200,62400,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,2900,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111800,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60700,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7200,0,'McMillan',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120046 b/src/main/res-next/raw/next_gtfs_schedule_stop_120046
new file mode 100644
index 000000000..84e694656
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120046
@@ -0,0 +1,8 @@
+'2357',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
+'2358',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
+'2357',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
+'2358',201,55200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,9000,,'',0,2500,,'',0,6500,,'',0,5700,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,3900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
+'2360',201,110700,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2361',201,110700,,'',0,14000,,'',0,18200,,'',0,20000,,'',0
+'2363',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120047 b/src/main/res-next/raw/next_gtfs_schedule_stop_120047
new file mode 100644
index 000000000..0f0fe92c0
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120047
@@ -0,0 +1,3 @@
+'2357',100,61100,0,'UFV',0,3700,0,'UFV',0,8100,0,'UFV',0,8100,0,'UFV',0,4600,0,'UFV',0,8500,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,5100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,4800,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,53000,0,'UFV',0,8100,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,2100,0,'UFV',0,2000,0,'UFV',0,4800,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5800,0,'UFV',0,2000,0,'UFV',0,2200,0,'UFV',0,6000,0,'UFV',0,2500,0,'UFV',0,6400,0,'UFV',0,2500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,2600,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2100,0,'UFV',0,2100,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,1900,0,'UFV',0,6000,0,'UFV',0,2000,0,'UFV',0,2600,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,2700,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0
+'2363',100,61300,0,'UFV',0,3100,0,'UFV',0,7800,0,'UFV',0,8700,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7100,0,'UFV',0,3000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7300,0,'UFV',0,3300,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,7500,0,'UFV',0,3300,0,'UFV',0,7400,0,'UFV',0,3400,0,'UFV',0,7200,0,'UFV',0,3300,0,'UFV',0,7200,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,7000,0,'UFV',0,3000,0,'UFV',0,7000,0,'UFV',0,2700,0,'UFV',0,6600,0,'UFV',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120048 b/src/main/res-next/raw/next_gtfs_schedule_stop_120048
new file mode 100644
index 000000000..4e0bf8012
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120048
@@ -0,0 +1,3 @@
+'2357',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2358',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,800,,'',0,1300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'2363',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120049 b/src/main/res-next/raw/next_gtfs_schedule_stop_120049
new file mode 100644
index 000000000..a44f02afe
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120049
@@ -0,0 +1,8 @@
+'2357',200,62200,0,'McMillan',0,8300,0,'McMillan',0,4200,0,'McMillan',0,8600,0,'McMillan',0,8500,0,'McMillan',0,8600,0,'McMillan',0,4500,0,'McMillan',0,9200,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,5100,0,'McMillan',0,8900,0,'McMillan',0,9000,0,'McMillan',0,8700,0,'McMillan',0,8900,0,'McMillan',0,4200,0,'McMillan',0
+'2358',200,54000,0,'McMillan',0,6200,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,2700,0,'McMillan',0,2100,0,'McMillan',0,6100,0,'McMillan',0,1700,0,'McMillan',0,1800,0,'McMillan',0,6200,0,'McMillan',0,1900,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,1800,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,6500,0,'McMillan',0,9700,0,'McMillan',0,1800,0,'McMillan',0,1800,0,'McMillan',0,5900,0,'McMillan',0,1500,0,'McMillan',0,3900,0,'McMillan',0,5900,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6000,0,'McMillan',0,2000,0,'McMillan',0,2000,0,'McMillan',0,6100,0,'McMillan',0,2300,0,'McMillan',0,7000,0,'McMillan',0,2900,0,'McMillan',0,6800,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0
+'2360',200,111600,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2361',200,111600,0,'McMillan',0,14000,0,'McMillan',0,18600,0,'McMillan',0,19600,0,'McMillan',0
+'2363',200,60500,0,'McMillan',0,4500,0,'McMillan',0,7500,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,7300,0,'McMillan',0,7300,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7400,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7100,0,'McMillan',0,3200,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,3000,0,'McMillan',0,7000,0,'McMillan',0,2600,0,'McMillan',0,7300,0,'McMillan',0
+'2358',2201,150500,,'',0
+'2360',2201,85200,,'',0
+'2361',2201,82200,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120050 b/src/main/res-next/raw/next_gtfs_schedule_stop_120050
new file mode 100644
index 000000000..7506fcef4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120050
@@ -0,0 +1,6 @@
+'2357',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2357',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
+'2358',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
+'2358',3301,60500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3400,4,'',0,7600,4,'',0,3600,4,'',0,8000,4,'',0,7900,4,'',0,3100,4,'',0,8200,4,'',0,3300,4,'',0,7700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0
+'2363',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'2363',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120055 b/src/main/res-next/raw/next_gtfs_schedule_stop_120055
new file mode 100644
index 000000000..b8951e6df
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120055
@@ -0,0 +1,3 @@
+'2357',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120056 b/src/main/res-next/raw/next_gtfs_schedule_stop_120056
new file mode 100644
index 000000000..9b84b150c
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120056
@@ -0,0 +1,3 @@
+'2357',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2358',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120057 b/src/main/res-next/raw/next_gtfs_schedule_stop_120057
new file mode 100644
index 000000000..4353521ba
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120057
@@ -0,0 +1,3 @@
+'2357',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2358',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'2363',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120058 b/src/main/res-next/raw/next_gtfs_schedule_stop_120058
new file mode 100644
index 000000000..4875b26f5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120058
@@ -0,0 +1,3 @@
+'2357',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2358',3400,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2363',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120059 b/src/main/res-next/raw/next_gtfs_schedule_stop_120059
new file mode 100644
index 000000000..e1fbddf66
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120059
@@ -0,0 +1,3 @@
+'2357',3501,93800,,'',0,30300,,'',0,59700,,'',0
+'2358',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2363',3501,82900,,'',0,67200,,'',0,22000,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120061 b/src/main/res-next/raw/next_gtfs_schedule_stop_120061
new file mode 100644
index 000000000..034a3120d
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120061
@@ -0,0 +1,6 @@
+'2357',700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
+'2357',701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2358',700,74900,4,'',0,6000,4,'',0,13500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,6500,4,'',0,13900,4,'',0,19900,4,'',0,19900,4,'',0
+'2358',701,74900,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
+'2363',700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
+'2363',701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120062 b/src/main/res-next/raw/next_gtfs_schedule_stop_120062
new file mode 100644
index 000000000..1fbab3e56
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120062
@@ -0,0 +1,3 @@
+'2357',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
+'2358',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'2363',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120063 b/src/main/res-next/raw/next_gtfs_schedule_stop_120063
new file mode 100644
index 000000000..2702c641b
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120063
@@ -0,0 +1,26 @@
+'2358',3100,95700,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0
+'2363',3100,91200,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0
+'2357',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
+'2358',3200,95900,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3700,4,'',0,11400,4,'',0,48500,4,'',0
+'2363',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0
+'2357',3300,190900,4,'',0
+'2357',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2358',3300,61900,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,51300,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,10600,4,'',0,9900,4,'',0
+'2358',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',3300,195900,4,'',0,14500,4,'',0
+'2363',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'2357',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
+'2357',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2358',3400,62000,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8500,4,'',0,3000,4,'',0,7600,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,10100,4,'',0
+'2358',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7300,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,10000,,'',0,9700,,'',0
+'2363',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
+'2363',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2357',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
+'2357',3501,93200,,'',0,30300,,'',0,59800,,'',0
+'2358',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
+'2358',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'2363',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'2363',3501,82400,,'',0,63100,,'',0,26000,,'',0
+'2357',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
+'2358',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
+'2363',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120064 b/src/main/res-next/raw/next_gtfs_schedule_stop_120064
new file mode 100644
index 000000000..d0466b40e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120064
@@ -0,0 +1,16 @@
+'2357',3100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
+'2357',3101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3100,61900,4,'',0,3100,4,'',0,5800,4,'',0,1300,4,'',0,1700,4,'',0,1300,4,'',0,5800,4,'',0,1300,4,'',0,1800,4,'',0,1200,4,'',0,7300,4,'',0,51000,4,'',0,7600,4,'',0,1700,4,'',0,2000,4,'',0,5300,4,'',0,900,4,'',0,1500,4,'',0,1700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1300,4,'',0,1800,4,'',0,5700,4,'',0,4200,4,'',0,7600,4,'',0,11400,4,'',0,15400,4,'',0,10900,4,'',0
+'2358',3101,62500,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,1300,,'',0,1800,,'',0,1500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,1400,,'',0,2000,,'',0,5200,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5800,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5700,,'',0,2000,,'',0,2500,,'',0,8500,,'',0,16500,,'',0,11000,,'',0
+'2363',3100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
+'2363',3101,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10500,,'',0,10500,,'',0
+'2357',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2358',3200,62000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,58800,4,'',0,11600,4,'',0,7400,4,'',0,3900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,11900,4,'',0,10700,4,'',0
+'2358',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,9000,,'',0,11000,,'',0
+'2363',3200,192700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
+'2363',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'2357',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
+'2358',3300,95400,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,65200,4,'',0,9600,4,'',0
+'2363',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0
+'2358',3400,95400,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0,65500,4,'',0
+'2363',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120067 b/src/main/res-next/raw/next_gtfs_schedule_stop_120067
new file mode 100644
index 000000000..530886843
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120067
@@ -0,0 +1,3 @@
+'2357',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'2358',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
+'2363',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120068 b/src/main/res-next/raw/next_gtfs_schedule_stop_120068
new file mode 100644
index 000000000..0700978b5
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120068
@@ -0,0 +1,3 @@
+'2357',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2358',500,61400,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
+'2363',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120069 b/src/main/res-next/raw/next_gtfs_schedule_stop_120069
new file mode 100644
index 000000000..d177a308e
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120069
@@ -0,0 +1,3 @@
+'2357',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'2363',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120070 b/src/main/res-next/raw/next_gtfs_schedule_stop_120070
new file mode 100644
index 000000000..cf398a6f4
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120070
@@ -0,0 +1,3 @@
+'2357',700,61100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,9500,0,'To McMillan',0,9600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,9900,0,'Sumas Mtn',0,12500,0,'Sumas Mtn',0
+'2358',700,62400,0,'Sumas Mtn',0,11600,0,'To McMillan',0,6000,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10100,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,9900,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2363',700,61100,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9600,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10400,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120071 b/src/main/res-next/raw/next_gtfs_schedule_stop_120071
new file mode 100644
index 000000000..a30c4e20a
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120071
@@ -0,0 +1,6 @@
+'2357',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2357',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
+'2358',400,61700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2358',401,61700,4,'',0,9600,4,'',0,2000,4,'',0,7300,4,'',0,11300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,2400,4,'',0,7600,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
+'2363',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2363',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120072 b/src/main/res-next/raw/next_gtfs_schedule_stop_120072
new file mode 100644
index 000000000..eecd00363
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120072
@@ -0,0 +1,26 @@
+'2357',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2358',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2363',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'2357',200,64400,0,'McMillan',0,8300,0,'McMillan',0,8200,0,'McMillan',0,4700,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,8600,0,'McMillan',0,9300,0,'McMillan',0,5100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9100,0,'McMillan',0,9000,0,'McMillan',0,8800,0,'McMillan',0,5000,0,'McMillan',0,8600,0,'McMillan',0,8900,0,'McMillan',0,8200,0,'McMillan',0
+'2358',200,60100,0,'McMillan',0,2300,0,'McMillan',0,3100,0,'McMillan',0,7300,0,'McMillan',0,2800,0,'McMillan',0,6200,0,'McMillan',0,2100,0,'McMillan',0,1700,0,'McMillan',0,5800,0,'McMillan',0,2100,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,2100,0,'McMillan',0,1800,0,'McMillan',0,6500,0,'McMillan',0,9000,0,'McMillan',0,2500,0,'McMillan',0,2500,0,'McMillan',0,9000,0,'McMillan',0,6600,0,'McMillan',0,2700,0,'McMillan',0,9500,0,'McMillan',0,1800,0,'McMillan',0,5800,0,'McMillan',0,1900,0,'McMillan',0,1500,0,'McMillan',0,7900,0,'McMillan',0,1800,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,1900,0,'McMillan',0,6000,0,'McMillan',0,1900,0,'McMillan',0,2100,0,'McMillan',0,6300,0,'McMillan',0,3000,0,'McMillan',0,6900,0,'McMillan',0,2800,0,'McMillan',0,2800,0,'McMillan',0,6900,0,'McMillan',0
+'2360',200,114300,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2361',200,114300,0,'McMillan',0,18000,0,'McMillan',0,19000,0,'McMillan',0,19300,0,'McMillan',0
+'2363',200,62600,0,'McMillan',0,8500,0,'McMillan',0,3600,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,3100,0,'McMillan',0,7100,0,'McMillan',0,3000,0,'McMillan',0,7100,0,'McMillan',0,3300,0,'McMillan',0,7400,0,'McMillan',0,7300,0,'McMillan',0,3500,0,'McMillan',0,7500,0,'McMillan',0,3300,0,'McMillan',0,7500,0,'McMillan',0,3400,0,'McMillan',0,7300,0,'McMillan',0,7400,0,'McMillan',0,3100,0,'McMillan',0,7200,0,'McMillan',0,3300,0,'McMillan',0,7100,0,'McMillan',0,3100,0,'McMillan',0,7000,0,'McMillan',0,2800,0,'McMillan',0,7000,0,'McMillan',0,3000,0,'McMillan',0,6600,0,'McMillan',0,3200,0,'McMillan',0
+'2357',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
+'2358',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,4,'',0
+'2363',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
+'2357',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,63700,4,'',0,9600,4,'',0,2000,4,'',0,18600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
+'2358',401,60500,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,2300,,'',0,7700,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2363',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',700,60600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5600,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9900,0,'To McMillan',0,10000,0,'Sumas Mtn',0,16500,0,'Sumas Mtn',0
+'2358',700,61900,0,'Sumas Mtn',0,11600,0,'To McMillan',0,2000,0,'To McMillan',0,7500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10500,0,'To McMillan',0,6500,0,'To McMillan',0,3500,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10000,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10900,0,'Sumas Mtn',0
+'2358',701,65200,4,'',0,17800,4,'',0,7400,4,'',0,10100,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,9900,4,'',0,10700,4,'',0,9800,4,'',0,10500,4,'',0,9800,4,'',0,10100,4,'',0,9800,4,'',0,10000,4,'',0
+'2363',700,60600,0,'To McMillan',0,10000,0,'Sumas Mtn',0,9500,0,'To McMillan',0,5000,0,'Sumas Mtn',0,15100,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10300,0,'To McMillan',0,10700,0,'Sumas Mtn',0,10500,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10400,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'To McMillan',0,10500,0,'Sumas Mtn',0,10000,0,'Sumas Mtn',0,17000,0,'Sumas Mtn',0
+'2357',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2358',901,61700,4,'',0,10100,4,'',0,10400,4,'',0,9800,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'2363',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'2358',1500,73700,4,'',0,12000,4,'',0,68300,4,'',0
+'2358',1600,73700,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
+'2358',2601,73600,,'',0,68500,,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120073 b/src/main/res-next/raw/next_gtfs_schedule_stop_120073
new file mode 100644
index 000000000..cbf783adf
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120073
@@ -0,0 +1,26 @@
+'2357',100,62800,0,'UFV',0,7900,0,'UFV',0,4100,0,'UFV',0,8100,0,'UFV',0,8600,0,'UFV',0,8700,0,'UFV',0,4600,0,'UFV',0,9000,0,'UFV',0,9000,0,'UFV',0,9100,0,'UFV',0,9100,0,'UFV',0,9000,0,'UFV',0,5000,0,'UFV',0,9000,0,'UFV',0,8800,0,'UFV',0,8700,0,'UFV',0,9000,0,'UFV',0,9900,0,'UFV',0
+'2358',100,54800,0,'UFV',0,8200,0,'UFV',0,7000,0,'UFV',0,3200,0,'UFV',0,2200,0,'UFV',0,6100,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,1900,0,'UFV',0,5900,0,'UFV',0,1800,0,'UFV',0,2000,0,'UFV',0,5500,0,'UFV',0,800,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2400,0,'UFV',0,2500,0,'UFV',0,6500,0,'UFV',0,1500,0,'UFV',0,1000,0,'UFV',0,6600,0,'UFV',0,2500,0,'UFV',0,6700,0,'UFV',0,2200,0,'UFV',0,2000,0,'UFV',0,6100,0,'UFV',0,2000,0,'UFV',0,2000,0,'UFV',0,6000,0,'UFV',0,1800,0,'UFV',0,1800,0,'UFV',0,1700,0,'UFV',0,5900,0,'UFV',0,1900,0,'UFV',0,2000,0,'UFV',0,6500,0,'UFV',0,2900,0,'UFV',0,6900,0,'UFV',0,2800,0,'UFV',0,6700,0,'UFV',0,2800,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0
+'2363',100,63100,0,'UFV',0,7100,0,'UFV',0,3900,0,'UFV',0,8700,0,'UFV',0,3100,0,'UFV',0,7000,0,'UFV',0,7200,0,'UFV',0,3100,0,'UFV',0,7100,0,'UFV',0,3300,0,'UFV',0,7100,0,'UFV',0,3400,0,'UFV',0,7300,0,'UFV',0,3500,0,'UFV',0,7500,0,'UFV',0,3500,0,'UFV',0,7400,0,'UFV',0,7300,0,'UFV',0,3400,0,'UFV',0,7400,0,'UFV',0,3200,0,'UFV',0,7200,0,'UFV',0,3200,0,'UFV',0,7000,0,'UFV',0,2900,0,'UFV',0,6800,0,'UFV',0,3000,0,'UFV',0,6900,0,'UFV',0,3000,0,'UFV',0,6600,0,'UFV',0,2600,0,'UFV',0
+'2357',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2358',201,52200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,5000,,'',0,6400,,'',0,2500,,'',0,9000,,'',0,6500,,'',0,2500,,'',0,9100,,'',0,1600,,'',0,1200,0,'Bourquin Exch Only',0,1100,,'',0,5900,,'',0,1500,,'',0,7900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2360',201,103200,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2361',201,103200,,'',0,17900,,'',0,14000,,'',0,19900,,'',0
+'2363',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'2357',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2358',300,60300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
+'2363',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'2357',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2358',400,82400,4,'',0,68000,4,'',0
+'2363',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2357',701,63300,,'',0,10300,,'',0,9900,,'',0,9800,,'',0,9400,,'',0,10300,,'',0,9700,,'',0,10300,,'',0,9700,,'',0,10200,,'',0,9800,,'',0,10100,,'',0,9700,,'',0,12500,,'',0
+'2358',701,65000,0,'Montrose Exch',0,15700,4,'',0,2100,0,'Montrose Exch',0,7400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10700,0,'Montrose Exch',0,2300,4,'',0,7500,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10500,4,'',0
+'2363',701,63500,,'',0,9900,,'',0,9900,,'',0,8800,,'',0,11400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10800,,'',0,10200,,'',0,14600,,'',0,10200,,'',0,10200,,'',0,10300,,'',0,10000,,'',0,12800,,'',0
+'2357',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2358',901,222200,4,'',0
+'2363',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'2358',1500,65200,4,'',0,108900,4,'',0,9000,4,'',0
+'2358',1501,61400,,'',0,4300,,'',0,15800,,'',0,64300,,'',0,24200,,'',0,5100,,'',0
+'2363',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
+'2363',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
+'2358',1601,80800,4,'',0,11900,4,'',0,68500,4,'',0,4600,4,'',0
+'2358',2600,82300,,'',0,68800,4,'',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120074 b/src/main/res-next/raw/next_gtfs_schedule_stop_120074
new file mode 100644
index 000000000..95755a994
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120074
@@ -0,0 +1,4 @@
+'2357',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2358',400,62000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,7600,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
+'2363',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'2358',2600,80700,,'',0,63600,0,'Montrose Exch Only',0
diff --git a/src/main/res-next/raw/next_gtfs_schedule_stop_120075 b/src/main/res-next/raw/next_gtfs_schedule_stop_120075
new file mode 100644
index 000000000..aaa5429de
--- /dev/null
+++ b/src/main/res-next/raw/next_gtfs_schedule_stop_120075
@@ -0,0 +1,3 @@
+'2357',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2358',301,54600,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
+'2363',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
diff --git a/src/main/res-current/raw/current_gtfs_schedule_stop_120077 b/src/main/res-next/raw/next_gtfs_schedule_stop_120077
similarity index 100%
rename from src/main/res-current/raw/current_gtfs_schedule_stop_120077
rename to src/main/res-next/raw/next_gtfs_schedule_stop_120077
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
new file mode 100644
index 000000000..5d2982a90
--- /dev/null
+++ b/src/main/res-next/values/next_gtfs_rts_values_gen.xml
@@ -0,0 +1,11 @@
+<?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.00754</string>
+    <string name="next_gtfs_rts_area_max_lat">49.1583</string>
+    <string name="next_gtfs_rts_area_min_lng">-122.47064</string>
+    <string name="next_gtfs_rts_area_max_lng">-122.21454</string>
+    <integer name="next_gtfs_rts_first_departure_in_sec">1704636000</integer><!-- 2024/01/07 06:00:00 PST -->
+    <integer name="next_gtfs_rts_last_departure_in_sec">1712470380</integer><!-- 2024/04/06 23:13:00 PDT -->
+</resources>
diff --git a/src/main/res/values/gtfs_rts_values.xml b/src/main/res/values/gtfs_rts_values.xml
index 1be7d6928..292d4c75a 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">20231226</integer>
+    <integer name="gtfs_rts_db_version">20240102</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_central_fraser_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>