diff --git a/app-android/src/main/play/release-notes/en-US/default.txt b/app-android/src/main/play/release-notes/en-US/default.txt
index 49c27241..17463a96 100644
--- a/app-android/src/main/play/release-notes/en-US/default.txt
+++ b/app-android/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-Schedule from September 8, 2024 to January 4, 2025.
+Schedule from September 22, 2024 to January 4, 2025.
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
index 4766174d..3bc532d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,61 +1,46 @@
-'3282',20240908,1
-'3277',20240909,1
-'3283',20240909,1
-'3277',20240910,1
-'3278',20240910,1
-'3277',20240911,1
-'3278',20240911,1
-'3277',20240912,1
-'3278',20240912,1
-'3277',20240913,1
-'3278',20240913,1
-'3281',20240914,1
-'3282',20240915,1
-'3277',20240916,1
-'3283',20240916,1
-'3277',20240917,1
-'3278',20240917,1
-'3277',20240918,1
-'3278',20240918,1
-'3277',20240919,1
-'3278',20240919,1
-'3277',20240920,1
-'3278',20240920,1
-'3281',20240921,1
'3282',20240922,1
-'3277',20240923,1
'3283',20240923,1
-'3277',20240924,1
-'3278',20240924,1
-'3277',20240925,1
-'3278',20240925,1
-'3277',20240926,1
-'3278',20240926,1
-'3277',20240927,1
-'3278',20240927,1
-'3281',20240928,1
+'3470',20240923,1
+'3470',20240924,1
+'3476',20240924,1
+'3470',20240925,1
+'3476',20240925,1
+'3470',20240926,1
+'3476',20240926,1
+'3470',20240927,1
+'3476',20240927,1
+'3466',20240928,1
'3282',20240929,1
'3282',20240930,1
-'3277',20241001,1
-'3278',20241001,1
-'3277',20241002,1
-'3278',20241002,1
-'3277',20241003,1
-'3278',20241003,1
-'3277',20241004,1
-'3278',20241004,1
-'3281',20241005,1
+'3470',20241001,1
+'3476',20241001,1
+'3470',20241002,1
+'3476',20241002,1
+'3470',20241003,1
+'3476',20241003,1
+'3470',20241004,1
+'3476',20241004,1
+'3466',20241005,1
'3282',20241006,1
-'3277',20241007,1
'3283',20241007,1
-'3277',20241008,1
-'3278',20241008,1
-'3277',20241009,1
-'3278',20241009,1
-'3277',20241010,1
-'3278',20241010,1
-'3277',20241011,1
-'3278',20241011,1
-'3281',20241012,1
+'3470',20241007,1
+'3470',20241008,1
+'3476',20241008,1
+'3470',20241009,1
+'3476',20241009,1
+'3470',20241010,1
+'3476',20241010,1
+'3470',20241011,1
+'3476',20241011,1
+'3466',20241012,1
'3282',20241013,1
'3282',20241014,1
+'3470',20241015,1
+'3476',20241015,1
+'3470',20241016,1
+'3476',20241016,1
+'3470',20241017,1
+'3476',20241017,1
+'3470',20241018,1
+'3476',20241018,1
+'3466',20241019,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
index d3108d01..5d9cd8ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
@@ -1,3 +1,3 @@
-'3277',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62100,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
index fb709cd6..bac81e82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
@@ -1,3 +1,3 @@
-'3277',201,54700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63700,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3282',201,65200,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63700,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,54700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105723 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105723
index ccc6124a..3227f435 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105723
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105723
@@ -1,3 +1,3 @@
-'3277',2201,150000,,'',0
-'3278',2201,81200,,'',0
'3283',2201,84200,,'',0
+'3470',2201,150000,,'',0
+'3476',2201,81200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105724 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105724
index 7ee4a5b6..473e2d57 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105724
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105724
@@ -1,3 +1,3 @@
-'3277',2201,145800,,'',0
-'3278',2201,80900,,'',0
'3283',2201,83900,,'',0
+'3470',2201,145800,,'',0
+'3476',2201,80900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105725 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105725
index 210a07d9..5a235520 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105725
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105725
@@ -1,3 +1,3 @@
-'3277',2201,145500,,'',0
-'3278',2201,80600,,'',0
'3283',2201,83600,,'',0
+'3470',2201,145500,,'',0
+'3476',2201,80600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105726 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105726
index 182bb5ca..15858225 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105726
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105726
@@ -1,6 +1,6 @@
-'3277',2600,144000,0,'Montrose Exch Only',0
-'3277',2601,144000,4,'',0
-'3278',2600,75900,,'',0
-'3278',2601,75900,4,'',0
'3283',2600,75900,,'',0
'3283',2601,75900,4,'',0
+'3470',2600,144000,0,'Montrose Exch Only',0
+'3470',2601,144000,4,'',0
+'3476',2600,75900,,'',0
+'3476',2601,75900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
index 49e6d4ba..f644ae16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
@@ -1,3 +1,3 @@
-'3277',1501,62200,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
-'3281',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3277',2600,145100,0,'Montrose Exch Only',0
+'3466',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62200,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
+'3470',2600,145100,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105729 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105729
index 4d4394e7..f6d66d54 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105729
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105729
@@ -1 +1 @@
-'3277',2400,145000,0,'Ctr Loop',0
+'3470',2400,145000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105730 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105730
index 607524a4..ceae56f7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105730
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105730
@@ -1,3 +1,3 @@
-'3277',2201,150300,,'',0
-'3278',2201,81400,,'',0
'3283',2201,84400,,'',0
+'3470',2201,150300,,'',0
+'3476',2201,81400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
index 2f593abe..6ba55923 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
@@ -1,6 +1,6 @@
-'3277',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62100,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
-'3277',2201,150600,,'',0
-'3278',2201,81600,,'',0
+'3466',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
'3283',2201,84600,,'',0
+'3470',2201,150600,,'',0
+'3476',2201,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105732 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105732
index 4b189b55..ec843f8e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105732
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105732
@@ -1 +1 @@
-'3277',2401,80800,0,'Ctr Loop',0
+'3470',2401,80800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105733 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105733
index 766a8334..ef122632 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105733
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105733
@@ -1,4 +1,4 @@
-'3277',2201,145200,,'',0
-'3278',2201,80400,,'',0
'3283',2201,83400,,'',0
-'3277',2400,143600,0,'Ctr Loop',0
+'3470',2201,145200,,'',0
+'3476',2201,80400,,'',0
+'3470',2400,143600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105734 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105734
index b5903e73..96de64c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105734
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105734
@@ -1,4 +1,4 @@
-'3277',2201,152100,,'',0
-'3278',2201,82700,,'',0
'3283',2201,85700,,'',0
-'3277',2401,75700,0,'Ctr Loop',0
+'3470',2201,152100,,'',0
+'3476',2201,82700,,'',0
+'3470',2401,75700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105735 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105735
index f8661117..88d90866 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105735
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105735
@@ -1,4 +1,4 @@
-'3277',2201,152100,,'',0
-'3278',2201,82800,,'',0
'3283',2201,85800,,'',0
-'3277',2401,75800,0,'Ctr Loop',0
+'3470',2201,152100,,'',0
+'3476',2201,82800,,'',0
+'3470',2401,75800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105736 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105736
index c95f4c9b..4d37d790 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105736
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105736
@@ -1,3 +1,3 @@
-'3277',2201,150900,,'',0
-'3278',2201,81800,,'',0
'3283',2201,84800,,'',0
+'3470',2201,150900,,'',0
+'3476',2201,81800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105737 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105737
index af9d22d1..321a3ee2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105737
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105737
@@ -1 +1 @@
-'3277',2400,144000,0,'Ctr Loop',0
+'3470',2400,144000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105738 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105738
index c6bf86ff..5cef0f30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105738
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105738
@@ -1,4 +1,4 @@
-'3277',2201,145300,,'',0
-'3278',2201,80500,,'',0
'3283',2201,83500,,'',0
-'3277',2400,143800,0,'Ctr Loop',0
+'3470',2201,145300,,'',0
+'3476',2201,80500,,'',0
+'3470',2400,143800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105739 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105739
index ff3eaa8e..2625b98b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105739
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105739
@@ -1 +1 @@
-'3277',2400,144900,0,'Ctr Loop',0
+'3470',2400,144900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
index 8546fc9d..0e2dfc69 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
@@ -1,3 +1,3 @@
-'3277',201,54500,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63500,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3282',201,65000,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63500,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,54500,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
index 57be40aa..6a6d4626 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
@@ -1,3 +1,3 @@
-'3277',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62500,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
index 0b434d2f..dbad4bae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
@@ -1,3 +1,3 @@
-'3277',200,54600,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,61000,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62700,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3466',200,61000,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54600,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
index 724c4e34..b4bc78a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
@@ -1,3 +1,3 @@
-'3277',200,54700,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62800,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3466',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54700,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
index 4b0f3741..ca3a2303 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
@@ -1,3 +1,3 @@
-'3277',200,54700,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62800,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3466',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54700,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
index 727a07bb..034bdb78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
@@ -1,3 +1,3 @@
-'3277',200,54800,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62900,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9400,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
+'3466',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54800,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
index 51775f87..09a09d37 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
@@ -1,3 +1,3 @@
-'3277',200,54800,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62900,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9400,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
+'3466',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54800,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
index 5bde1519..50890ff3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
@@ -1,11 +1,11 @@
-'3277',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,63000,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
-'3277',301,60500,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72800,,'',0
-'3281',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3466',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
'3282',301,63500,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72800,,'',0
-'3277',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3466',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60500,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72800,,'',0
'3282',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
+'3466',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
index 29a96c97..82ebea55 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
@@ -1,12 +1,12 @@
-'3277',100,53000,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',100,61800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61800,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3277',200,55000,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61400,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,61800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,53000,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',200,63100,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3277',2100,65500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,10900,,'',0
-'3281',2100,82900,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3466',200,61400,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55000,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3470',1700,65000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3282',2100,95200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143200,0,'Ctr Loop',0
-'3277',1002100,152800,,'',0,9500,,'',0
+'3466',2100,82900,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,10900,,'',0
+'3470',2400,143200,0,'Ctr Loop',0
+'3470',1002100,152800,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
index 24ab88bb..d91ed079 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
@@ -1,12 +1,12 @@
-'3277',100,53100,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61900,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3277',200,55100,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61500,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,53100,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',200,63200,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3277',2100,65600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
-'3281',2100,83000,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3466',200,61500,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55100,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3470',1700,65100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3282',2100,95300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143300,0,'Ctr Loop',0
-'3277',1002100,152900,,'',0,9500,,'',0
+'3466',2100,83000,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
+'3470',2400,143300,0,'Ctr Loop',0
+'3470',1002100,152900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
index 306455bc..8887dbd1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
@@ -1,12 +1,12 @@
-'3277',100,53100,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6800,,'',0
'3282',100,61900,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3277',200,55200,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6800,,'',0
+'3470',100,53100,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3282',200,63300,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8600,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65100,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7600,,'',0
-'3277',2100,65600,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
-'3281',2100,83100,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3466',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55200,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3470',1700,65100,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7600,,'',0
'3282',2100,95400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143500,0,'Ctr Loop',0
-'3277',1002100,153000,,'',0,9500,,'',0
+'3466',2100,83100,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65600,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
+'3470',2400,143500,0,'Ctr Loop',0
+'3470',1002100,153000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
index 0974d750..d4badd05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
@@ -1,14 +1,14 @@
-'3277',100,53200,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'3281',100,62000,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,62000,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4800,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5500,,'',0,15900,,'',0
-'3277',200,55200,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,62000,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,53200,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
'3282',200,63300,,'',0,8300,,'',0,4100,,'',0,8800,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65200,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
-'3277',2100,65700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
-'3281',2100,83100,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3466',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55200,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3470',1700,65200,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
'3282',2100,95400,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3277',2201,152200,,'',0
-'3278',2201,82900,,'',0
+'3466',2100,83100,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3470',2100,65700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
'3283',2201,85900,,'',0
-'3277',1002100,153100,,'',0,9500,,'',0
+'3470',2201,152200,,'',0
+'3476',2201,82900,,'',0
+'3470',1002100,153100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
index ff101907..7761137a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
@@ -1,14 +1,14 @@
-'3277',100,53300,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'3281',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6900,,'',0
'3282',100,62100,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4800,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',200,55300,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,61700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,53300,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
'3282',200,63400,,'',0,8300,,'',0,4100,,'',0,8800,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65300,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
-'3277',2100,65800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
-'3281',2100,83200,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3466',200,61700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55300,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3470',1700,65300,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
'3282',2100,95500,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3277',2201,152300,,'',0
-'3278',2201,82900,,'',0
+'3466',2100,83200,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3470',2100,65800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
'3283',2201,85900,,'',0
-'3277',1002100,153200,,'',0,9500,,'',0
+'3470',2201,152300,,'',0
+'3476',2201,82900,,'',0
+'3470',1002100,153200,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
index bd52b741..c541b57f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
@@ -1,14 +1,14 @@
-'3277',100,53300,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6800,,'',0
'3282',100,62100,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9600,,'',0,11900,,'',0
-'3277',200,55400,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6800,,'',0
+'3470',100,53300,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3282',200,63500,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8000,,'',0,8800,,'',0,9000,,'',0
-'3277',1700,65300,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
-'3277',2100,65800,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
-'3281',2100,83300,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3466',200,61800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,55400,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3470',1700,65300,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
'3282',2100,95600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2201,152400,,'',0
-'3278',2201,83000,,'',0
+'3466',2100,83300,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65800,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
'3283',2201,90000,,'',0
-'3277',1002100,153300,,'',0,9500,,'',0
+'3470',2201,152400,,'',0
+'3476',2201,83000,,'',0
+'3470',1002100,153300,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
index c0fe94fa..c7c67e2c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
@@ -1,17 +1,17 @@
-'3277',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62200,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9600,,'',0,11900,,'',0
-'3277',200,55500,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,7000,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3282',200,63600,,'',0,8300,,'',0,8100,,'',0,4700,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8000,,'',0,8800,,'',0,9000,,'',0
-'3277',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3281',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3466',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,7000,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55500,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
'3282',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
-'3277',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
-'3281',2100,83400,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3466',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3470',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
+'3470',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
'3282',2100,95700,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2201,152500,,'',0
-'3278',2201,83100,,'',0
+'3466',2100,83400,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
'3283',2201,90100,,'',0
-'3277',1002100,153400,,'',0,9500,,'',0
+'3470',2201,152500,,'',0
+'3476',2201,83100,,'',0
+'3470',1002100,153400,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
index 8d8a7f5a..f9cd152c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
@@ -1,17 +1,17 @@
-'3277',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62200,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',200,55500,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',200,63600,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8600,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3281',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3466',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55500,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',1700,65400,,'',0,7300,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7500,,'',0
-'3277',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16700,,'',0,17400,,'',0,20600,,'',0,4800,,'',0,15500,,'',0,10800,,'',0
-'3281',2100,83400,,'',0,20300,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12100,,'',0,10900,,'',0
+'3466',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3470',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
+'3470',1700,65400,,'',0,7300,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7500,,'',0
'3282',2100,95700,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3277',2201,152600,,'',0
-'3278',2201,83100,,'',0
+'3466',2100,83400,,'',0,20300,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12100,,'',0,10900,,'',0
+'3470',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16700,,'',0,17400,,'',0,20600,,'',0,4800,,'',0,15500,,'',0,10800,,'',0
'3283',2201,90100,,'',0
-'3277',1002100,153500,,'',0,9500,,'',0
+'3470',2201,152600,,'',0
+'3476',2201,83100,,'',0
+'3470',1002100,153500,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
index a82def51..4092f895 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
@@ -1,19 +1,19 @@
-'3277',601,62200,4,'',0,8400,4,'',0,3600,4,'',0,7700,4,'',0,3500,4,'',0,7800,4,'',0,8000,4,'',0,11700,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
-'3281',601,63000,4,'',0,12200,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10100,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10800,4,'',0,10200,4,'',0,10500,4,'',0,9900,4,'',0,10000,4,'',0,9400,4,'',0
'3282',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,9500,4,'',0,8800,4,'',0,5500,4,'',0,15500,4,'',0,11700,4,'',0
-'3277',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72600,4,'',0,7800,4,'',0,8500,4,'',0,3700,4,'',0,7500,4,'',0
-'3277',2100,70000,4,'',0,3300,4,'',0,9600,4,'',0,10500,4,'',0,11600,4,'',0,15000,4,'',0,12700,4,'',0,17400,4,'',0,20600,4,'',0,4800,4,'',0,15500,4,'',0,10800,4,'',0
-'3281',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19300,4,'',0,16400,4,'',0,11200,4,'',0,9300,4,'',0,12100,4,'',0,10900,4,'',0
+'3466',601,63000,4,'',0,12200,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10100,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10800,4,'',0,10200,4,'',0,10500,4,'',0,9900,4,'',0,10000,4,'',0,9400,4,'',0
+'3470',601,62200,4,'',0,8400,4,'',0,3600,4,'',0,7700,4,'',0,3500,4,'',0,7800,4,'',0,8000,4,'',0,11700,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
+'3470',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72600,4,'',0,7800,4,'',0,8500,4,'',0,3700,4,'',0,7500,4,'',0
'3282',2100,95800,4,'',0,17100,4,'',0,17100,4,'',0,13000,4,'',0,12900,4,'',0,16800,4,'',0,12800,4,'',0
-'3277',2201,152700,4,'',0
-'3278',2201,83200,4,'',0
+'3466',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19300,4,'',0,16400,4,'',0,11200,4,'',0,9300,4,'',0,12100,4,'',0,10900,4,'',0
+'3470',2100,70000,4,'',0,3300,4,'',0,9600,4,'',0,10500,4,'',0,11600,4,'',0,15000,4,'',0,12700,4,'',0,17400,4,'',0,20600,4,'',0,4800,4,'',0,15500,4,'',0,10800,4,'',0
'3283',2201,90200,4,'',0
-'3277',3101,64500,4,'',0,8500,4,'',0,7200,4,'',0,3300,4,'',0,7400,4,'',0,4800,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11100,4,'',0,11900,4,'',0,7900,4,'',0,7400,4,'',0,3600,4,'',0,6600,4,'',0,3100,4,'',0,1600,4,'',0,38300,4,'',0
-'3281',3101,81900,4,'',0,10300,4,'',0,10600,4,'',0,11000,4,'',0,11100,4,'',0,10900,4,'',0,15500,4,'',0,11500,4,'',0,10900,4,'',0,10800,4,'',0
+'3470',2201,152700,4,'',0
+'3476',2201,83200,4,'',0
'3282',3101,102800,4,'',0,21900,4,'',0,11000,4,'',0,15400,4,'',0,11500,4,'',0,11000,4,'',0
-'3277',1002100,153600,4,'',0,9500,4,'',0
-'3277',1003101,74800,4,'',0,7000,4,'',0,3600,4,'',0,7300,4,'',0,10400,4,'',0,10900,4,'',0,11100,4,'',0,15000,4,'',0,11700,4,'',0,9500,4,'',0,3800,4,'',0,7500,4,'',0,3000,4,'',0,6300,4,'',0,10500,4,'',0,8500,4,'',0,12200,4,'',0
-'3278',1003101,71700,4,'',0
-'3281',1003101,85200,4,'',0,10600,4,'',0,14600,4,'',0,11100,4,'',0,11200,4,'',0,10900,4,'',0,11500,4,'',0,15500,4,'',0,10700,4,'',0,11000,4,'',0,11500,4,'',0,9900,4,'',0
+'3466',3101,81900,4,'',0,10300,4,'',0,10600,4,'',0,11000,4,'',0,11100,4,'',0,10900,4,'',0,15500,4,'',0,11500,4,'',0,10900,4,'',0,10800,4,'',0
+'3470',3101,64500,4,'',0,8500,4,'',0,7200,4,'',0,3300,4,'',0,7400,4,'',0,4800,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11100,4,'',0,11900,4,'',0,7900,4,'',0,7400,4,'',0,3600,4,'',0,6600,4,'',0,3100,4,'',0,1600,4,'',0,38300,4,'',0
+'3470',1002100,153600,4,'',0,9500,4,'',0
'3282',1003101,92500,4,'',0,21400,4,'',0,7500,4,'',0,11000,4,'',0,11100,4,'',0,11400,4,'',0,15400,4,'',0,11000,4,'',0,10900,4,'',0,11500,4,'',0,10000,4,'',0
'3283',1003101,71700,4,'',0
+'3466',1003101,85200,4,'',0,10600,4,'',0,14600,4,'',0,11100,4,'',0,11200,4,'',0,10900,4,'',0,11500,4,'',0,15500,4,'',0,10700,4,'',0,11000,4,'',0,11500,4,'',0,9900,4,'',0
+'3470',1003101,74800,4,'',0,7000,4,'',0,3600,4,'',0,7300,4,'',0,10400,4,'',0,10900,4,'',0,11100,4,'',0,15000,4,'',0,11700,4,'',0,9500,4,'',0,3800,4,'',0,7500,4,'',0,3000,4,'',0,6300,4,'',0,10500,4,'',0,8500,4,'',0,12200,4,'',0
+'3476',1003101,71700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
index e651fc29..7854fcac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
@@ -1,24 +1,24 @@
-'3277',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62300,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3466',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64500,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60200,,'',0
-'3281',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3466',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3282',501,61700,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60200,,'',0
-'3281',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60200,,'',0
'3282',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',900,63000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',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
-'3277',2400,142100,0,'Ctr Loop',0
-'3277',2601,141500,,'',0
-'3278',2601,72500,,'',0
+'3466',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',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
+'3470',2400,142100,0,'Ctr Loop',0
'3283',2601,72500,,'',0
-'3281',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',2601,141500,,'',0
+'3476',2601,72500,,'',0
'3282',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
index faa7da24..de0160dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
@@ -1,24 +1,24 @@
-'3277',100,53600,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62400,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53600,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60000,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3466',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64500,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60300,,'',0
-'3281',501,63600,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3466',401,60000,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',501,61700,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60300,,'',0
-'3281',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',501,63600,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60300,,'',0
'3282',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',900,63100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',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
-'3277',2400,142100,0,'Ctr Loop',0
-'3277',2601,141600,,'',0
-'3278',2601,72600,,'',0
+'3466',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',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
+'3470',2400,142100,0,'Ctr Loop',0
'3283',2601,72600,,'',0
-'3281',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',2601,141600,,'',0
+'3476',2601,72600,,'',0
'3282',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
index 17414edd..11a95134 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
@@ -1,17 +1,17 @@
-'3277',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,63800,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3466',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64600,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60300,,'',0
-'3281',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3466',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3282',501,61800,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60300,,'',0
-'3281',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60300,,'',0
'3282',900,63100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',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
-'3277',2400,142200,0,'Ctr Loop',0
-'3277',2601,141600,,'',0
-'3278',2601,72600,,'',0
+'3466',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',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
+'3470',2400,142200,0,'Ctr Loop',0
'3283',2601,72600,,'',0
+'3470',2601,141600,,'',0
+'3476',2601,72600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
index 91ae4dea..9b8bea1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
@@ -1,17 +1,17 @@
-'3277',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,63800,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60100,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3466',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64600,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60300,,'',0
-'3281',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3466',401,60100,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',501,61800,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60300,,'',0
-'3281',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60300,,'',0
'3282',900,63200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',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
-'3277',2400,142200,0,'Ctr Loop',0
-'3277',2601,141700,,'',0
-'3278',2601,72700,,'',0
+'3466',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',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
+'3470',2400,142200,0,'Ctr Loop',0
'3283',2601,72700,,'',0
+'3470',2601,141700,,'',0
+'3476',2601,72700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
index c224df64..183cb791 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
@@ -1,10 +1,10 @@
-'3277',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,63900,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60200,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3466',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64700,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3281',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',401,60200,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3282',900,63200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,141800,,'',0
-'3278',2601,72700,,'',0
+'3466',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3283',2601,72700,,'',0
+'3470',2601,141800,,'',0
+'3476',2601,72700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
index 5596fad9..7c3c3f83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
@@ -1,10 +1,10 @@
-'3277',200,55900,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64000,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60300,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3466',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55900,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64800,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3281',900,64300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',401,60300,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3282',900,63300,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,141900,,'',0
-'3278',2601,72800,,'',0
+'3466',900,64300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3283',2601,72800,,'',0
+'3470',2601,141900,,'',0
+'3476',2601,72800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
index 85f25977..17915fe1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
@@ -1,10 +1,10 @@
-'3277',200,60000,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64000,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3281',401,60300,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3466',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60000,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',401,64800,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3281',900,64400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',401,60300,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',900,63400,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142000,,'',0
-'3278',2601,72900,,'',0
+'3466',900,64400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3283',2601,72900,,'',0
+'3470',2601,142000,,'',0
+'3476',2601,72900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
index 0f0d43c1..61ebc7f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
@@ -1,9 +1,9 @@
-'3277',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3281',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64500,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,54600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,64600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
'3282',900,63600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142300,,'',0
-'3278',2601,73200,,'',0
+'3466',900,64600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,54600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73200,,'',0
+'3470',2601,142300,,'',0
+'3476',2601,73200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
index 6d4b6e76..a30d4d97 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
@@ -1,9 +1,9 @@
-'3277',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3281',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64500,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3281',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
'3282',900,63700,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142300,,'',0
-'3278',2601,73200,,'',0
+'3466',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
'3283',2601,73200,,'',0
+'3470',2601,142300,,'',0
+'3476',2601,73200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
index b05f7b4c..d35c36a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
@@ -1,9 +1,9 @@
-'3277',200,60600,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3281',200,62900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64600,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,54700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',200,62900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60600,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
'3282',900,63700,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142400,,'',0
-'3278',2601,73300,,'',0
+'3466',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,54700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73300,,'',0
+'3470',2601,142400,,'',0
+'3476',2601,73300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
index e60e6d1f..8ca13c05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
@@ -1,9 +1,9 @@
-'3277',200,60600,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
-'3281',200,62900,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3282',200,64600,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8700,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,54800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,64800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',200,62900,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
+'3470',200,60600,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
'3282',900,63800,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142500,,'',0
-'3278',2601,73400,,'',0
+'3466',900,64800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,54800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73400,,'',0
+'3470',2601,142500,,'',0
+'3476',2601,73400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
index 8fb98743..0931e049 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
@@ -1,9 +1,9 @@
-'3277',200,60700,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
-'3281',200,63000,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3282',200,64700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8700,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,54900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3281',900,64800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',200,63000,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
+'3470',200,60700,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,6900,,'',0,2200,,'',0,2000,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
'3282',900,63800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',2601,142600,,'',0
-'3278',2601,73400,,'',0
+'3466',900,64800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',900,54900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
'3283',2601,73400,,'',0
+'3470',2601,142600,,'',0
+'3476',2601,73400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
index 6ad11783..7a744f79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
@@ -1,9 +1,9 @@
-'3277',200,60900,,'',0,2100,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3281',200,63200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3282',200,64900,,'',0,8300,,'',0,8100,,'',0,8800,,'',0,4700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',900,55000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,64900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',200,63200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60900,,'',0,2100,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
'3282',900,63900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2601,142800,,'',0
-'3278',2601,73600,,'',0
+'3466',900,64900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73600,,'',0
+'3470',2601,142800,,'',0
+'3476',2601,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
index f165c31b..99df2de2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
@@ -1,6 +1,6 @@
-'3277',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2601,142900,,'',0
-'3278',2601,73700,,'',0
+'3466',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73700,,'',0
+'3470',2601,142900,,'',0
+'3476',2601,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
index f165c31b..99df2de2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
@@ -1,6 +1,6 @@
-'3277',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2601,142900,,'',0
-'3278',2601,73700,,'',0
+'3466',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73700,,'',0
+'3470',2601,142900,,'',0
+'3476',2601,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
index cc6c2009..5078b70e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
@@ -1,6 +1,6 @@
-'3277',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2601,143000,,'',0
-'3278',2601,73800,,'',0
+'3466',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73800,,'',0
+'3470',2601,143000,,'',0
+'3476',2601,73800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
index c160a5bf..fb07b540 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
@@ -1,6 +1,6 @@
-'3277',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2601,143000,,'',0
-'3278',2601,73800,,'',0
+'3466',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73800,,'',0
+'3470',2601,143000,,'',0
+'3476',2601,73800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
index ae76a231..38933786 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
@@ -1,5 +1,5 @@
-'3277',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,73900,,'',0
+'3466',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,73900,,'',0
+'3476',2601,73900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
index f3ea67b3..f49608af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
@@ -1,5 +1,5 @@
-'3277',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,73900,,'',0
+'3466',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
'3283',2601,73900,,'',0
+'3476',2601,73900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
index 29bd0336..67e7978a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
@@ -1,5 +1,5 @@
-'3277',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74000,,'',0
+'3466',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74000,,'',0
+'3476',2601,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
index 29bd0336..67e7978a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
@@ -1,5 +1,5 @@
-'3277',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74000,,'',0
+'3466',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74000,,'',0
+'3476',2601,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
index 02b64434..950f240e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
@@ -1,5 +1,5 @@
-'3277',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74000,,'',0
+'3466',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74000,,'',0
+'3476',2601,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
index 928ebbd9..f0f6cda7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
@@ -1,7 +1,7 @@
-'3277',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3278',2601,74100,,'',0
+'3466',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3466',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
'3283',2601,74100,,'',0
+'3476',2601,74100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
index 8d30d6a2..aaa19b31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
@@ -1,7 +1,7 @@
-'3277',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3278',2601,74200,,'',0
+'3466',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3466',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
'3283',2601,74200,,'',0
+'3476',2601,74200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
index 8d30d6a2..aaa19b31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
@@ -1,7 +1,7 @@
-'3277',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3278',2601,74200,,'',0
+'3466',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3466',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
'3283',2601,74200,,'',0
+'3476',2601,74200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
index 8ae3e28e..93b8b34f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
@@ -1,5 +1,5 @@
-'3277',900,55600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64500,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74300,,'',0
+'3466',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74300,,'',0
+'3476',2601,74300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
index e10f3c01..4a15c634 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
@@ -1,5 +1,5 @@
-'3277',900,55600,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,5900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64500,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74400,,'',0
+'3466',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55600,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,5900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74400,,'',0
+'3476',2601,74400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
index 286a0d29..ae40f7a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
@@ -1,5 +1,5 @@
-'3277',900,55700,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74500,,'',0
+'3466',900,65600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55700,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74500,,'',0
+'3476',2601,74500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
index 9c8546ba..f61cf364 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
@@ -1,5 +1,5 @@
-'3277',900,55800,,'',0,10100,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14600,,'',0
-'3281',900,65700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64700,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74700,,'',0
+'3466',900,65700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55800,,'',0,10100,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14600,,'',0
'3283',2601,74700,,'',0
+'3476',2601,74700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
index 6cc983c4..3f9dbb4d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
@@ -1,5 +1,5 @@
-'3277',900,55900,,'',0,10000,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3281',900,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74700,,'',0
+'3466',900,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55900,,'',0,10000,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
'3283',2601,74700,,'',0
+'3476',2601,74700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
index ba8ea0e9..3eb557a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
@@ -1,8 +1,8 @@
-'3277',900,55900,4,'',0,14100,4,'',0,10200,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10600,4,'',0
-'3277',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',900,65800,4,'',0,9500,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'3281',901,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',900,64800,4,'',0,17000,4,'',0,13100,4,'',0,17000,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17000,4,'',0
'3282',901,64800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74800,,'',0
+'3466',900,65800,4,'',0,9500,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'3466',901,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',900,55900,4,'',0,14100,4,'',0,10200,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10600,4,'',0
+'3470',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2601,74800,,'',0
+'3476',2601,74800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
index b83aaa3c..639bf33c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
@@ -1,5 +1,5 @@
-'3277',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,64900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74900,,'',0
+'3466',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2601,74900,,'',0
+'3476',2601,74900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
index 9a431959..e1571b1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
@@ -1,5 +1,5 @@
-'3277',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,64900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3278',2601,74900,,'',0
+'3466',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2601,74900,,'',0
+'3476',2601,74900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
index 2d23eab4..8bd11a56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
@@ -1,7 +1,7 @@
-'3277',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1500,64000,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3278',2601,75000,,'',0
+'3466',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3466',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64000,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
'3283',2601,75000,,'',0
+'3476',2601,75000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
index 1fdce87f..a809ee3f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
@@ -1,7 +1,7 @@
-'3277',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1500,64100,,'',0,8400,,'',0,12000,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3278',2601,75000,,'',0
+'3466',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3466',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64100,,'',0,8400,,'',0,12000,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
'3283',2601,75000,,'',0
+'3476',2601,75000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
index 7b630b25..3cdbf9b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
@@ -1,3 +1,3 @@
-'3277',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3466',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
index 53b573b6..ced29b34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
@@ -1,3 +1,3 @@
-'3277',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3466',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
index 3e893cb6..70c9ce53 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
@@ -1,3 +1,3 @@
-'3277',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3466',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
index 344680c5..32b1dc73 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
@@ -1,5 +1,5 @@
-'3277',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',1501,62300,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
-'3281',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3466',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62300,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
index 945941aa..5894064d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
@@ -1,2 +1,2 @@
-'3277',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
index 6ba9b680..43a7533a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
@@ -1,4 +1,4 @@
-'3277',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,145800,0,'Montrose Exch Only',0
+'3466',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3470',2600,145800,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
index 6ba9b680..43a7533a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
@@ -1,4 +1,4 @@
-'3277',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,145800,0,'Montrose Exch Only',0
+'3466',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3470',2600,145800,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
index 09095609..49df9490 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
@@ -1,4 +1,4 @@
-'3277',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,145900,0,'Montrose Exch Only',0
+'3466',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3470',2600,145900,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
index 09095609..49df9490 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
@@ -1,4 +1,4 @@
-'3277',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,145900,0,'Montrose Exch Only',0
+'3466',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3470',2600,145900,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
index b5f42a93..0be8933d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
@@ -1,4 +1,4 @@
-'3277',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150000,0,'Montrose Exch Only',0
+'3466',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3470',2600,150000,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
index 95fc7728..6143f449 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
@@ -1,6 +1,6 @@
-'3277',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150200,0,'Montrose Exch Only',0
-'3278',2600,81000,,'',0
+'3466',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81000,,'',0
+'3470',2600,150200,0,'Montrose Exch Only',0
+'3476',2600,81000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
index 95fc7728..6143f449 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
@@ -1,6 +1,6 @@
-'3277',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3282',901,65600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150200,0,'Montrose Exch Only',0
-'3278',2600,81000,,'',0
+'3466',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81000,,'',0
+'3470',2600,150200,0,'Montrose Exch Only',0
+'3476',2600,81000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
index 32d6b00a..59379382 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
@@ -1,9 +1,9 @@
-'3277',201,51700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,60700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',201,60700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,51700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,65700,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150300,0,'Montrose Exch Only',0
-'3278',2600,81100,,'',0
+'3466',901,70700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81100,,'',0
+'3470',2600,150300,0,'Montrose Exch Only',0
+'3476',2600,81100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
index b7905dd2..1c32d6c7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
@@ -1,9 +1,9 @@
-'3277',201,51800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,60800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62300,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',201,60800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,51800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,65700,,'',0,17000,,'',0,13200,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',2600,150400,0,'Montrose Exch Only',0
-'3278',2600,81200,,'',0
+'3466',901,70700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81200,,'',0
+'3470',2600,150400,0,'Montrose Exch Only',0
+'3476',2600,81200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
index 5010655c..b1584354 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
@@ -1,9 +1,9 @@
-'3277',201,51900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,60900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62400,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,60900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'3281',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',201,60900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,51900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,65900,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150500,0,'Montrose Exch Only',0
-'3278',2600,81300,,'',0
+'3466',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,60900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
'3283',2600,81300,,'',0
+'3470',2600,150500,0,'Montrose Exch Only',0
+'3476',2600,81300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
index 040a7617..4531699e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
@@ -1,9 +1,9 @@
-'3277',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,65900,,'',0,17000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150600,0,'Montrose Exch Only',0
-'3278',2600,81300,,'',0
+'3466',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81300,,'',0
+'3470',2600,150600,0,'Montrose Exch Only',0
+'3476',2600,81300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
index 662139e1..98fc710d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
@@ -1,9 +1,9 @@
-'3277',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'3281',901,71000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,70000,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3277',2600,150700,0,'Montrose Exch Only',0
-'3278',2600,81400,,'',0
+'3466',901,71000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
'3283',2600,81400,,'',0
+'3470',2600,150700,0,'Montrose Exch Only',0
+'3476',2600,81400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
index 0990ba16..8c6bf8c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
@@ -1,9 +1,9 @@
-'3277',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62600,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,70000,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',2600,150700,0,'Montrose Exch Only',0
-'3278',2600,81500,,'',0
+'3466',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81500,,'',0
+'3470',2600,150700,0,'Montrose Exch Only',0
+'3476',2600,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
index 5e3b786d..b1b08a78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
@@ -1,9 +1,9 @@
-'3277',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62600,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'3281',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,70000,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',2600,150800,0,'Montrose Exch Only',0
-'3278',2600,81500,,'',0
+'3466',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
'3283',2600,81500,,'',0
+'3470',2600,150800,0,'Montrose Exch Only',0
+'3476',2600,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
index 9a2c2865..9dfdbb75 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
@@ -1,9 +1,9 @@
-'3277',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62700,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3281',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,70100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',2600,150800,0,'Montrose Exch Only',0
-'3278',2600,81600,,'',0
+'3466',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
'3283',2600,81600,,'',0
+'3470',2600,150800,0,'Montrose Exch Only',0
+'3476',2600,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
index 9a244c4a..e44ef729 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
@@ -1,10 +1,10 @@
-'3277',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62700,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',901,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'3281',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',901,70100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',1601,80500,,'',0,12100,,'',0,68200,,'',0,4900,,'',0
-'3277',2600,150900,0,'Montrose Exch Only',0
-'3278',2600,81600,,'',0
+'3466',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'3470',1601,80500,,'',0,12100,,'',0,68200,,'',0,4900,,'',0
'3283',2600,81600,,'',0
+'3470',2600,150900,0,'Montrose Exch Only',0
+'3476',2600,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
index 999852dd..14b7cbe4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
@@ -1,23 +1,23 @@
-'3277',100,54000,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62800,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',100,62800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54000,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',201,62800,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',300,55800,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62900,,'',0
-'3281',300,60100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',300,64200,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,62900,,'',0
-'3277',400,62600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
-'3281',400,63100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,9900,,'',0
+'3466',300,60100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55800,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62900,,'',0
'3282',400,71600,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',901,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
-'3281',901,71200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3466',400,63100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,9900,,'',0
+'3470',400,62600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
'3282',901,70200,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3277',1500,64900,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
-'3281',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',1601,80500,,'',0,12200,,'',0,68200,,'',0,4800,,'',0
-'3277',2600,150900,0,'Montrose Exch Only',0
-'3278',2600,81600,,'',0
+'3466',901,71200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3470',901,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10700,0,'Montrose Exch',0
+'3466',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64900,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
+'3470',1601,80500,,'',0,12200,,'',0,68200,,'',0,4800,,'',0
'3283',2600,81600,,'',0
+'3470',2600,150900,0,'Montrose Exch Only',0
+'3476',2600,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
index abdf8720..eb586315 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
@@ -1,9 +1,9 @@
-'3277',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2700,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3466',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2700,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,71800,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3281',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3282',901,70400,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3278',2600,82000,,'',0
+'3466',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3283',2600,82000,,'',0
+'3476',2600,82000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
index 1f835eb3..d033e426 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
@@ -1,9 +1,9 @@
-'3277',201,52800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1500,,'',0,1000,0,'Bourquin Exch Only',0,1200,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,61800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63300,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63400,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3466',201,61800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1500,,'',0,1000,0,'Bourquin Exch Only',0,1200,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,71900,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3281',901,71500,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',400,63400,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3282',901,70500,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3278',2600,82100,,'',0
+'3466',901,71500,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3283',2600,82100,,'',0
+'3476',2600,82100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
index 553eea6d..0cfb3593 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
@@ -1,16 +1,16 @@
-'3277',201,52900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,1000,0,'Bourquin Exch Only',0,5200,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,61900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63400,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63400,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
+'3466',201,61900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,1000,0,'Bourquin Exch Only',0,5200,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,71900,,'',0,20200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12800,,'',0
-'3277',500,61900,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3400,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74500,,'',0
-'3281',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3466',400,63400,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
'3282',500,64800,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74500,,'',0
-'3281',901,71600,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61900,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3400,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74500,,'',0
'3282',901,70600,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',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
-'3277',2401,81200,0,'Ctr Loop',0
-'3278',2600,82200,,'',0
+'3466',901,71600,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',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
+'3470',2401,81200,0,'Ctr Loop',0
'3283',2600,82200,,'',0
+'3476',2600,82200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
index 490f67bf..fff8fa41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
@@ -1,16 +1,16 @@
-'3277',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
+'3466',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,72000,,'',0,20200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12800,,'',0
-'3277',500,62000,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74500,,'',0
-'3281',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3466',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
'3282',500,64900,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74500,,'',0
-'3281',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3470',500,62000,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74500,,'',0
'3282',901,70700,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,12900,,'',0
-'3277',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
-'3277',2401,81300,0,'Ctr Loop',0
-'3278',2600,82300,,'',0
+'3466',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',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
+'3470',2401,81300,0,'Ctr Loop',0
'3283',2600,82300,,'',0
+'3476',2600,82300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
index 74077984..590cb11f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
@@ -1,23 +1,23 @@
-'3277',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62300,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3277',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
'3282',201,63500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
+'3466',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,72000,,'',0,20200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12800,,'',0
-'3277',500,62000,,'',0,9300,,'',0,10900,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7400,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74600,,'',0
-'3281',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3466',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
'3282',500,64900,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74600,,'',0
-'3281',701,74000,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3470',500,62000,,'',0,9300,,'',0,10900,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7400,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74600,,'',0
'3282',701,63900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3281',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',701,74000,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',901,70700,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,12900,,'',0
-'3277',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
-'3277',2401,81400,0,'Ctr Loop',0
-'3278',2600,82400,,'',0
+'3466',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3470',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
+'3470',2401,81400,0,'Ctr Loop',0
'3283',2600,82400,,'',0
-'3281',1000701,64000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3476',2600,82400,,'',0
'3282',1000701,74100,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3466',1000701,64000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
index 95f082fe..5e029ee5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
@@ -1,14 +1,14 @@
-'3277',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62200,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62500,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3277',201,53200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62200,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62200,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,63700,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3277',1701,62700,,'',0,3200,,'',0,8700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,55900,,'',0,7200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
-'3281',2101,73800,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3466',201,62200,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3470',1701,62700,,'',0,3200,,'',0,8700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90000,,'',0,13000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2201,144700,,'',0
-'3278',2201,80100,,'',0
+'3466',2101,73800,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,55900,,'',0,7200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
'3283',2201,83100,,'',0
-'3277',1002101,71900,,'',0
+'3470',2201,144700,,'',0
+'3476',2201,80100,,'',0
+'3470',1002101,71900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
index 7855b479..d24948aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
@@ -1,14 +1,14 @@
-'3277',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62300,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7300,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62600,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3277',201,53300,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62300,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7300,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
'3282',201,63800,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3277',1701,62800,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60000,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
-'3281',2101,73800,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3466',201,62300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53300,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3470',1701,62800,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90000,,'',0,13000,,'',0,12800,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2201,144800,,'',0
-'3278',2201,80200,,'',0
+'3466',2101,73800,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60000,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
'3283',2201,83200,,'',0
-'3277',1002101,71900,,'',0
+'3470',2201,144800,,'',0
+'3476',2201,80200,,'',0
+'3470',1002101,71900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
index 1a4f508b..d44fb645 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
@@ -1,14 +1,14 @@
-'3277',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62300,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62600,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3277',201,53300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62300,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62300,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,63800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3277',1701,62800,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12700,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
-'3281',2101,73900,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3466',201,62300,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3470',1701,62800,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90100,,'',0,13000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2201,144900,,'',0
-'3278',2201,80200,,'',0
+'3466',2101,73900,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12700,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
'3283',2201,83200,,'',0
-'3277',1002101,72000,,'',0
+'3470',2201,144900,,'',0
+'3476',2201,80200,,'',0
+'3470',1002101,72000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
index 0a6e9287..76107ade 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
@@ -1,14 +1,14 @@
-'3277',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62400,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62700,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3277',201,53400,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62400,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62400,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,63900,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3277',1701,62900,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60100,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3281',2101,73900,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3466',201,62400,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53400,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3470',1701,62900,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90100,,'',0,13000,,'',0,12800,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2201,145000,,'',0
-'3278',2201,80300,,'',0
+'3466',2101,73900,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60100,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
'3283',2201,83300,,'',0
-'3277',1002101,72000,,'',0
+'3470',2201,145000,,'',0
+'3476',2201,80300,,'',0
+'3470',1002101,72000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
index 2da8755d..d1859b89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
@@ -1,12 +1,12 @@
-'3277',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62400,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,62700,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3277',201,53500,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62500,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62400,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,64000,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3277',1701,63000,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60200,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3281',2101,74100,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3466',201,62500,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53500,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3470',1701,63000,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2401,75900,0,'Ctr Loop',0
-'3277',1002101,72200,,'',0
+'3466',2101,74100,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60200,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
+'3470',2401,75900,0,'Ctr Loop',0
+'3470',1002101,72200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
index 00be0b78..fe654dc1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
@@ -1,6 +1,6 @@
-'3277',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62500,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,62800,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3277',201,53600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62600,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62500,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,64100,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3466',201,62600,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
index 0200a8d3..48d18106 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
@@ -1,6 +1,6 @@
-'3277',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62600,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,5000,,'',0
'3282',101,62900,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3277',201,53600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62600,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3466',101,62600,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,5000,,'',0
+'3470',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,64100,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8600,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3466',201,62600,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
index a260163e..42fb5a1d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
@@ -1,11 +1,11 @@
-'3277',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64200,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8600,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3277',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61500,,'',0
-'3281',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3466',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3282',300,63000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61500,,'',0
-'3277',2201,151400,,'',0
-'3278',2201,82300,,'',0
+'3466',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61500,,'',0
'3283',2201,85300,,'',0
+'3470',2201,151400,,'',0
+'3476',2201,82300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
index 8ff1f8d4..44aa5f90 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
@@ -1,6 +1,6 @@
-'3277',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64200,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3277',2201,151500,,'',0
-'3278',2201,82300,,'',0
+'3466',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3283',2201,85300,,'',0
+'3470',2201,151500,,'',0
+'3476',2201,82300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
index b9bd8bfc..a9c5fe27 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
@@ -1,6 +1,6 @@
-'3277',201,53800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62800,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64300,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3277',2201,151600,,'',0
-'3278',2201,82400,,'',0
+'3466',201,62800,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3283',2201,85400,,'',0
+'3470',2201,151600,,'',0
+'3476',2201,82400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
index fafd7135..8e46e541 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
@@ -1,6 +1,6 @@
-'3277',201,53900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,62900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64400,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3277',2201,145700,,'',0
-'3278',2201,80800,,'',0
+'3466',201,62900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
'3283',2201,83800,,'',0
+'3470',2201,145700,,'',0
+'3476',2201,80800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
index 2fbb13ed..27610e3a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
@@ -1,3 +1,3 @@
-'3277',201,54000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64500,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
index 3f956786..42b8c4d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
@@ -1,3 +1,3 @@
-'3277',201,54200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63200,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64700,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63200,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
index 5443b156..251fb898 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
@@ -1,3 +1,3 @@
-'3277',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
index 0ec1b21b..c32b5dea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
@@ -1,3 +1,3 @@
-'3277',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
index 228340aa..db19d1f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
@@ -1,3 +1,3 @@
-'3277',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64900,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
index 25f1c793..962f9a00 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
@@ -1,6 +1,6 @@
-'3277',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,60900,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
-'3277',200,53700,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60100,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3466',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',200,61800,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3466',200,60100,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3470',200,53700,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
index bdc646e1..19c8ad70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
@@ -1,3 +1,3 @@
-'3277',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1500,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,60900,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3466',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1500,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
index ba356be3..e52ad56e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
@@ -1,3 +1,3 @@
-'3277',100,52100,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,60800,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61000,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3466',100,60800,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52100,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
index e03862a2..7db8aade 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
@@ -1,6 +1,6 @@
-'3277',100,52100,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,60900,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61000,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
-'3277',200,53800,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60200,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3466',100,60900,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52100,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',200,61900,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3466',200,60200,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3470',200,53800,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
index d6a3c35c..0a5a3bcf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
@@ -1,6 +1,6 @@
-'3277',100,52200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,60900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61100,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3277',200,53800,,'',0,2000,,'',0,7000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60200,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3466',100,60900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3282',200,61900,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3466',200,60200,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,53800,,'',0,2000,,'',0,7000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
index 34e8d10b..f3df3303 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
@@ -1,3 +1,3 @@
-'3277',100,52300,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61100,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61200,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3466',100,61100,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52300,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
index f03c20ad..2f7c35b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
@@ -1,3 +1,3 @@
-'3277',100,52400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61300,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
+'3466',100,61100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
index 72bcf737..2e8e17ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
@@ -1,3 +1,3 @@
-'3277',100,52500,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61400,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
+'3466',100,61300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52500,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
index 77015c1a..a84afa86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
@@ -1,6 +1,6 @@
-'3277',100,52600,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61500,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3277',2201,151000,,'',0
-'3278',2201,81900,,'',0
+'3466',100,61400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52600,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3283',2201,84900,,'',0
+'3470',2201,151000,,'',0
+'3476',2201,81900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
index 7a9583b1..37cc5043 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
@@ -1,6 +1,6 @@
-'3277',100,52700,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61600,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3277',2201,151100,,'',0
-'3278',2201,82000,,'',0
+'3466',100,61500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52700,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'3283',2201,85000,,'',0
+'3470',2201,151100,,'',0
+'3476',2201,82000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
index ef9478ad..e3ab96fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
@@ -1,6 +1,6 @@
-'3277',100,52800,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',100,61600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61600,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3277',2201,151200,,'',0
-'3278',2201,82100,,'',0
+'3466',100,61600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52800,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3283',2201,85100,,'',0
+'3470',2201,151200,,'',0
+'3476',2201,82100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
index 3b7df3b6..78362a10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
@@ -1,6 +1,6 @@
-'3277',100,52900,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61700,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3277',2201,151300,,'',0
-'3278',2201,82200,,'',0
+'3466',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52900,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3283',2201,85200,,'',0
+'3470',2201,151300,,'',0
+'3476',2201,82200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
index cc2ec4c6..058c9508 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
@@ -1,3 +1,3 @@
-'3277',100,52900,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61700,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
+'3466',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52900,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
index e60aac3a..178aac58 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
@@ -1,10 +1,10 @@
-'3277',301,60700,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,73000,,'',0
-'3281',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63700,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',301,73000,,'',0
-'3277',500,61100,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73500,,'',0
-'3281',500,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3466',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60700,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,73000,,'',0
'3282',500,64100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',500,73500,,'',0
+'3466',500,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61100,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
index d4d67202..e413ea7f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
@@ -1,23 +1,23 @@
-'3277',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3277',301,60000,,'',0,5200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',300,62300,,'',0
-'3278',301,72200,,'',0
-'3281',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3281',301,65000,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',300,63600,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3282',301,63000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',300,62300,,'',0
'3283',301,72200,,'',0
-'3277',601,55600,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',301,65000,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3470',301,60000,,'',0,5200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',300,62300,,'',0
+'3476',301,72200,,'',0
'3282',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,73600,0,'Ctr Loop',0
-'3277',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90300,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55600,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,73600,0,'Ctr Loop',0
'3282',3100,111700,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3281',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90300,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82600,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62400,,'',0,3000,,'',0
-'3278',24003100,55500,,'',0
+'3466',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
'3283',24003100,55500,,'',0
+'3470',24003100,62400,,'',0,3000,,'',0
+'3476',24003100,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
index 8091dfc9..d06b2728 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
@@ -1,23 +1,23 @@
-'3277',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3277',301,60000,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',300,62300,,'',0
-'3278',301,72300,,'',0
-'3281',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3281',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',300,63700,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3282',301,63000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',300,62300,,'',0
'3283',301,72300,,'',0
-'3277',601,55600,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3470',301,60000,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',300,62300,,'',0
+'3476',301,72300,,'',0
'3282',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,73700,0,'Ctr Loop',0
-'3277',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90300,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55600,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,73700,0,'Ctr Loop',0
'3282',3100,111700,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3281',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90300,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82600,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62400,,'',0,3000,,'',0
-'3278',24003100,55500,,'',0
+'3466',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
'3283',24003100,55500,,'',0
+'3470',24003100,62400,,'',0,3000,,'',0
+'3476',24003100,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
index f27c9377..6b451a17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
@@ -1,18 +1,18 @@
-'3277',300,55400,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62400,,'',0
-'3281',300,55700,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63700,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,62400,,'',0
-'3277',601,55700,,'',0,8000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',300,55700,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55400,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62400,,'',0
'3282',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,73800,0,'Ctr Loop',0
-'3277',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90400,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55700,,'',0,8000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,73800,0,'Ctr Loop',0
'3282',3100,111800,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90400,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82700,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62500,,'',0,3000,,'',0
-'3278',24003100,55600,,'',0
+'3466',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,55600,,'',0
+'3470',24003100,62500,,'',0,3000,,'',0
+'3476',24003100,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
index 35ddf2f4..a58d0c97 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
@@ -1,18 +1,18 @@
-'3277',300,55400,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62500,,'',0
-'3281',300,55700,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63800,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,62500,,'',0
-'3277',601,55700,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',300,55700,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55400,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62500,,'',0
'3282',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,73800,0,'Ctr Loop',0
-'3277',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90400,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55700,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,73800,0,'Ctr Loop',0
'3282',3100,111800,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3281',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90400,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82700,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62500,,'',0,3000,,'',0
-'3278',24003100,55600,,'',0
+'3466',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
'3283',24003100,55600,,'',0
+'3470',24003100,62500,,'',0,3000,,'',0
+'3476',24003100,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
index d979e602..8399e9ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
@@ -1,18 +1,18 @@
-'3277',300,55500,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62500,,'',0
-'3281',300,55800,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63900,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,62500,,'',0
-'3277',601,55700,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60600,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',300,55800,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55500,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62500,,'',0
'3282',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,73900,0,'Ctr Loop',0
-'3277',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90500,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',601,60600,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55700,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,73900,0,'Ctr Loop',0
'3282',3100,111900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90500,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82800,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62600,,'',0,3000,,'',0
-'3278',24003100,55700,,'',0
+'3466',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,55700,,'',0
+'3470',24003100,62600,,'',0,3000,,'',0
+'3476',24003100,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
index 8fd35c4e..939f89ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
@@ -1,14 +1,14 @@
-'3277',300,55600,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62600,,'',0
-'3281',300,55900,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63900,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,62600,,'',0
-'3277',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90500,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',300,55900,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55600,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62600,,'',0
'3282',3100,111900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3281',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90500,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82800,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62600,,'',0,3000,,'',0
-'3278',24003100,55700,,'',0
+'3466',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
'3283',24003100,55700,,'',0
+'3470',24003100,62600,,'',0,3000,,'',0
+'3476',24003100,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
index dd671770..7fba00f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
@@ -1,14 +1,14 @@
-'3277',300,55700,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62700,,'',0
-'3281',300,60000,,'',0,10000,,'',0,5900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,64000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,62700,,'',0
-'3277',3100,72500,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90600,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',300,60000,,'',0,10000,,'',0,5900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55700,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62700,,'',0
'3282',3100,112000,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,64000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,82900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90600,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72500,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82900,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62700,,'',0,3000,,'',0
-'3278',24003100,55800,,'',0
+'3466',1003100,82900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,64000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,55800,,'',0
+'3470',24003100,62700,,'',0,3000,,'',0
+'3476',24003100,55800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
index 6eeed63a..9877c223 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
@@ -1,14 +1,14 @@
-'3277',300,55700,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62800,,'',0
-'3281',300,60000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,64100,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,62800,,'',0
-'3277',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90700,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',300,60000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55700,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62800,,'',0
'3282',3100,112100,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90700,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
'3282',1003100,83000,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62800,,'',0,3000,,'',0
-'3278',24003100,55900,,'',0
+'3466',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,55900,,'',0
+'3470',24003100,62800,,'',0,3000,,'',0
+'3476',24003100,55900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
index 2f345b90..0eafa8d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
@@ -1,8 +1,8 @@
-'3277',100,54500,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63200,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',300,60300,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63400,,'',0
-'3281',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3466',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54500,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',300,64600,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63400,,'',0
+'3466',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60300,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
index 0976dc86..2e196006 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
@@ -1,8 +1,8 @@
-'3277',100,54500,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63200,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3277',300,60300,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,63500,,'',0
-'3281',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
+'3466',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54500,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',300,64600,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3283',300,63500,,'',0
+'3466',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60300,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,63500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
index 7ee2d504..2364a2ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
@@ -1,8 +1,8 @@
-'3277',100,54600,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63400,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63300,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',300,60400,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63500,,'',0
-'3281',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3466',100,63400,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54600,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',300,64700,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63500,,'',0
+'3466',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60400,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
index fe8d399d..9afecd8a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
@@ -1,5 +1,5 @@
-'3277',300,60400,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,63600,,'',0
-'3281',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
'3282',300,64700,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3283',300,63600,,'',0
+'3466',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60400,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,63600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
index 422f3d2c..02c09ad9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
@@ -1,5 +1,5 @@
-'3277',300,60500,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63600,,'',0
-'3281',300,60800,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
'3282',300,64800,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63600,,'',0
+'3466',300,60800,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60500,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
index a01d6257..b9c0a111 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
@@ -1,5 +1,5 @@
-'3277',300,60600,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63700,,'',0
-'3281',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
'3282',300,64900,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63700,,'',0
+'3466',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60600,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
index 1af96ce3..1835f8b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
@@ -1,12 +1,12 @@
-'3277',300,60600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,63800,,'',0
-'3281',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
'3282',300,64900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3283',300,63800,,'',0
-'3277',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,63800,,'',0
'3282',700,60900,,'',0,20000,,'',0,15000,,'',0,24100,,'',0,20000,,'',0,20000,,'',0,15900,,'',0,16500,,'',0
-'3277',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3277',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3282',1000700,70900,,'',0,19500,,'',0,15500,,'',0,24100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
index 547eea48..69a751e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
@@ -1,12 +1,12 @@
-'3277',300,60700,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63800,,'',0
-'3281',300,61000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0
'3282',300,65000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63800,,'',0
-'3277',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',300,61000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0
+'3470',300,60700,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63800,,'',0
'3282',700,60900,,'',0,20000,,'',0,15000,,'',0,24100,,'',0,20000,,'',0,20000,,'',0,15900,,'',0,16500,,'',0
-'3277',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3277',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3282',1000700,70900,,'',0,19500,,'',0,15500,,'',0,24100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
index 16dbd9f3..53de2ac3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
@@ -1,5 +1,5 @@
-'3277',300,60800,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,64000,,'',0
-'3281',300,61100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3282',300,65100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10100,,'',0,10000,,'',0
'3283',300,64000,,'',0
+'3466',300,61100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
+'3470',300,60800,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,64000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
index ce9295b5..a175834f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
@@ -1,5 +1,5 @@
-'3277',300,60900,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,64100,,'',0
-'3281',300,61200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3282',300,65200,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10100,,'',0,10000,,'',0
'3283',300,64100,,'',0
+'3466',300,61200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
+'3470',300,60900,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,64100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
index b164ea32..71e3e175 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
@@ -1,10 +1,10 @@
-'3277',300,62300,4,'',0,10200,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3700,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3000,4,'',0,8500,4,'',0,8400,4,'',0,9900,4,'',0,9400,4,'',0
-'3277',301,54000,,'',0,9000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8900,0,'Montrose Exch Only',0
-'3278',300,65500,4,'',0
-'3278',301,70000,,'',0
-'3281',300,62500,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,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,7000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0
-'3281',301,63000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3282',300,70500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0
'3282',301,61000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
'3283',300,65500,4,'',0
'3283',301,70000,,'',0
+'3466',300,62500,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,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,7000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0
+'3466',301,63000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3470',300,62300,4,'',0,10200,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3700,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3000,4,'',0,8500,4,'',0,8400,4,'',0,9900,4,'',0,9400,4,'',0
+'3470',301,54000,,'',0,9000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8900,0,'Montrose Exch Only',0
+'3476',300,65500,4,'',0
+'3476',301,70000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
index a7cb722b..623fd8b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
@@ -1,5 +1,5 @@
-'3277',300,62200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,65400,,'',0
-'3281',300,62400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3282',300,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0
'3283',300,65400,,'',0
+'3466',300,62400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
+'3470',300,62200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,65400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
index b6a14a38..1b981dd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
@@ -1,5 +1,5 @@
-'3277',300,61400,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,5900,,'',0,9400,,'',0
-'3278',300,64600,,'',0
-'3281',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3282',300,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3283',300,64600,,'',0
+'3466',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
+'3470',300,61400,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,5900,,'',0,9400,,'',0
+'3476',300,64600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
index 9830e187..0348b3a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
@@ -1,5 +1,5 @@
-'3277',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3278',300,64700,,'',0
-'3281',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3282',300,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3283',300,64700,,'',0
+'3466',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
+'3470',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3476',300,64700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
index 9830e187..0348b3a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
@@ -1,5 +1,5 @@
-'3277',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3278',300,64700,,'',0
-'3281',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3282',300,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3283',300,64700,,'',0
+'3466',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
+'3470',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3476',300,64700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
index 34b14888..7eb35073 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
@@ -1,5 +1,5 @@
-'3277',300,61600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3278',300,64800,,'',0
-'3281',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3282',300,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3283',300,64800,,'',0
+'3466',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
+'3470',300,61600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3476',300,64800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
index b5a134ed..917cbdce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
@@ -1,5 +1,5 @@
-'3277',300,61200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3278',300,64400,,'',0
-'3281',300,61400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3282',300,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3283',300,64400,,'',0
+'3466',300,61400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
+'3470',300,61200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3476',300,64400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
index f7f3aa01..593aecd5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
@@ -1,5 +1,5 @@
-'3277',301,54200,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70300,,'',0
-'3281',301,63200,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3282',301,61200,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70300,,'',0
+'3466',301,63200,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3470',301,54200,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
index bb23a301..a9a80d6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
@@ -1,5 +1,5 @@
-'3277',301,54300,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70400,,'',0
-'3281',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3282',301,61300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70400,,'',0
+'3466',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3470',301,54300,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
index b78fe35f..5525a4a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
@@ -1,11 +1,11 @@
-'3277',301,54400,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70500,,'',0
-'3281',301,63400,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3282',301,61400,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70500,,'',0
-'3277',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',301,63400,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3470',301,54400,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70500,,'',0
'3282',701,63000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73200,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
index 91f11b80..aacac94a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
@@ -1,11 +1,11 @@
-'3277',301,54500,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70600,,'',0
-'3281',301,63500,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3282',301,61500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70600,,'',0
-'3277',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',301,63500,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3470',301,54500,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70600,,'',0
'3282',701,63000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73200,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
index 0882fbeb..358f9b81 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
@@ -1,5 +1,5 @@
-'3277',301,54600,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70700,,'',0
-'3281',301,63600,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
'3282',301,61600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70700,,'',0
+'3466',301,63600,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54600,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
index b58975f5..d5dc556e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
@@ -1,5 +1,5 @@
-'3277',301,54800,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70900,,'',0
-'3281',301,63800,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
'3282',301,61800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70900,,'',0
+'3466',301,63800,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54800,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
index 0c64c9ae..d4eb5510 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
@@ -1,8 +1,8 @@
-'3277',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61500,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',301,54800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,71000,,'',0
-'3281',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3466',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',301,61800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,71000,,'',0
+'3466',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,71000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
index 1193b9bc..921eb42b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
@@ -1,8 +1,8 @@
-'3277',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',301,54900,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,71000,,'',0
-'3281',301,63900,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3466',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',301,61900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,71000,,'',0
+'3466',301,63900,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54900,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,71000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
index f42a1071..3e36f069 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
@@ -1,8 +1,8 @@
-'3277',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61600,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',301,54900,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,71100,,'',0
-'3281',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3466',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',301,61900,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,71100,,'',0
+'3466',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54900,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,71100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
index 1d2add8b..dd63ffe6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
@@ -1,8 +1,8 @@
-'3277',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61300,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61700,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',301,55000,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,71200,,'',0
-'3281',301,64000,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3466',101,61300,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',301,62000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,71200,,'',0
+'3466',301,64000,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,55000,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,71200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
index 2ee935c9..81b79af5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
@@ -1,10 +1,10 @@
-'3277',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71600,,'',0
-'3281',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3282',301,62400,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3283',301,71600,,'',0
-'3277',401,60100,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3466',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3470',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71600,,'',0
'3282',401,65100,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61600,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3281',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60100,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3466',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61600,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
index 3686b37c..49f3a4cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
@@ -1,13 +1,13 @@
-'3277',301,55400,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71600,,'',0
-'3281',301,64400,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,62400,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3283',301,71600,,'',0
-'3277',3101,64000,,'',0,8500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
-'3281',3101,81400,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3466',301,64400,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,55400,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71600,,'',0
'3282',3101,102300,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71200,,'',0
-'3281',1003101,84700,,'',0,10600,,'',0,10600,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81400,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3470',3101,64000,,'',0,8500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
'3282',1003101,92000,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71200,,'',0
+'3466',1003101,84700,,'',0,10600,,'',0,10600,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
index 0fe668dd..6bfd374f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
@@ -1,13 +1,13 @@
-'3277',301,55500,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71700,,'',0
-'3281',301,64500,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3282',301,62500,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3283',301,71700,,'',0
-'3277',3101,64100,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,81500,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3466',301,64500,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3470',301,55500,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71700,,'',0
'3282',3101,102400,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71300,,'',0
-'3281',1003101,84800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81500,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,64100,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,92100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71300,,'',0
+'3466',1003101,84800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
index fdd9dd32..c24ac939 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
@@ -1,13 +1,13 @@
-'3277',301,55500,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71700,,'',0
-'3281',301,64500,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,62500,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3283',301,71700,,'',0
-'3277',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
-'3281',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3466',301,64500,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,55500,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71700,,'',0
'3282',3101,102500,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71400,,'',0
-'3281',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
'3282',1003101,92200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71400,,'',0
+'3466',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
index fe89e0cd..ffb43d02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
@@ -1,14 +1,14 @@
-'3277',301,55600,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71800,,'',0
-'3281',301,64600,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3282',301,62600,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,71800,,'',0
-'3277',2400,145900,0,'Ctr Loop',0
-'3277',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3466',301,64600,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3470',301,55600,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71800,,'',0
+'3470',2400,145900,0,'Ctr Loop',0
'3282',3101,102500,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71400,,'',0
-'3281',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,92200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71400,,'',0
+'3466',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
index cfb1c4f7..985f4767 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
@@ -1,14 +1,14 @@
-'3277',301,55600,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71800,,'',0
-'3281',301,64600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,62600,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,71800,,'',0
-'3277',2400,150000,0,'Ctr Loop',0
-'3277',3101,64300,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
-'3281',3101,81700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3466',301,64600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,55600,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71800,,'',0
+'3470',2400,150000,0,'Ctr Loop',0
'3282',3101,102600,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74500,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71500,,'',0
-'3281',1003101,85000,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,64300,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
'3282',1003101,92300,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71500,,'',0
+'3466',1003101,85000,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74500,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
index a276c925..3469e517 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
@@ -1,14 +1,14 @@
-'3277',301,55700,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,71900,,'',0
-'3281',301,64700,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,62700,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3283',301,71900,,'',0
-'3277',2400,150100,0,'Ctr Loop',0
-'3277',3101,64300,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
-'3281',3101,81700,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3466',301,64700,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,55700,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,71900,,'',0
+'3470',2400,150100,0,'Ctr Loop',0
'3282',3101,102600,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74600,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71500,,'',0
-'3281',1003101,85000,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81700,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3470',3101,64300,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
'3282',1003101,92300,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71500,,'',0
+'3466',1003101,85000,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74600,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
index 57bf7797..df41c138 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
@@ -1,19 +1,19 @@
-'3277',300,55000,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3277',301,55800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3278',300,62000,,'',0
-'3278',301,72000,,'',0
-'3281',300,55300,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3281',301,64800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3282',300,63400,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3282',301,62800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',300,62000,,'',0
'3283',301,72000,,'',0
-'3277',2400,150200,0,'Ctr Loop',0
-'3277',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
-'3281',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3466',300,55300,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',301,64800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3470',300,55000,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3470',301,55800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3476',300,62000,,'',0
+'3476',301,72000,,'',0
+'3470',2400,150200,0,'Ctr Loop',0
'3282',3101,102700,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71600,,'',0
-'3281',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3470',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
'3282',1003101,92400,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71600,,'',0
+'3466',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
index ae0f5bfa..f91c55b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
@@ -1,19 +1,19 @@
-'3277',300,55000,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3277',301,55800,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',300,62000,,'',0
-'3278',301,72000,,'',0
-'3281',300,55300,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3281',301,64800,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',300,63400,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3282',301,62800,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',300,62000,,'',0
'3283',301,72000,,'',0
-'3277',2400,150200,0,'Ctr Loop',0
-'3277',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
-'3281',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3466',300,55300,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',301,64800,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',300,55000,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3470',301,55800,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',300,62000,,'',0
+'3476',301,72000,,'',0
+'3470',2400,150200,0,'Ctr Loop',0
'3282',3101,102700,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71600,,'',0
-'3281',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3470',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
'3282',1003101,92400,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71600,,'',0
+'3466',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
index 38ca6672..813b8b38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
@@ -1,3 +1,3 @@
-'3277',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62600,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,62900,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
+'3466',101,62600,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
index f2cfbdb4..620917d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
@@ -1,3 +1,3 @@
-'3277',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,62900,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3466',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
index c2b0744f..5843a97e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
@@ -1,3 +1,3 @@
-'3277',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,63000,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3466',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
index eb8a351c..fa472cba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
@@ -1,3 +1,3 @@
-'3277',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62800,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3282',101,63000,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3466',101,62800,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
index f1bc8388..1249bcf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
@@ -1,3 +1,3 @@
-'3277',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62900,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3282',101,63100,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3466',101,62900,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
index 2ee4ea2a..cbbee034 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
@@ -1,3 +1,3 @@
-'3277',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,63000,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3282',101,63200,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3466',101,63000,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
index 8a777d8e..5db3c66c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
@@ -1,16 +1,16 @@
-'3277',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61300,,'',0
-'3281',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,5900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61300,,'',0
-'3277',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73300,,'',0
-'3281',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3466',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61300,,'',0
'3282',500,64000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',500,73300,,'',0
-'3277',1700,64800,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3277',2100,65300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
-'3281',2100,82700,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3466',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73300,,'',0
+'3470',1700,64800,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3282',2100,95000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143100,0,'Ctr Loop',0
-'3277',1002100,152600,,'',0,9500,,'',0
+'3466',2100,82700,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
+'3470',2400,143100,0,'Ctr Loop',0
+'3470',1002100,152600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
index 756e8eec..cd2176e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
@@ -1,16 +1,16 @@
-'3277',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61300,,'',0
-'3281',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,5900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61300,,'',0
-'3277',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73300,,'',0
-'3281',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3466',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61300,,'',0
'3282',500,64000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',500,73300,,'',0
-'3277',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4300,,'',0,7900,,'',0,7600,,'',0
-'3277',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,10900,,'',0
-'3281',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3466',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73300,,'',0
+'3470',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4300,,'',0,7900,,'',0,7600,,'',0
'3282',2100,95100,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143100,0,'Ctr Loop',0
-'3277',1002100,152600,,'',0,9500,,'',0
+'3466',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,10900,,'',0
+'3470',2400,143100,0,'Ctr Loop',0
+'3470',1002100,152600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
index d5ec65c7..be80d922 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
@@ -1,16 +1,16 @@
-'3277',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61300,,'',0
-'3281',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61300,,'',0
-'3277',500,61100,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73400,,'',0
-'3281',500,70100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3466',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61300,,'',0
'3282',500,64000,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3283',500,73400,,'',0
-'3277',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3277',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,11000,,'',0
-'3281',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3466',500,70100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61100,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73400,,'',0
+'3470',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3282',2100,95100,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',2400,143200,0,'Ctr Loop',0
-'3277',1002100,152700,,'',0,9500,,'',0
+'3466',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,11000,,'',0
+'3470',2400,143200,0,'Ctr Loop',0
+'3470',1002100,152700,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
index 6c68d0b4..6f7bbbc8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
@@ -1,5 +1,5 @@
-'3277',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61500,,'',0
-'3281',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,63000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61500,,'',0
+'3466',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
index 39275c1e..f51afb78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
@@ -1,5 +1,5 @@
-'3277',300,54600,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61600,,'',0
-'3281',300,54900,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63000,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61600,,'',0
+'3466',300,54900,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,54600,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
index 47943389..eae939a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
@@ -1,5 +1,5 @@
-'3277',300,54600,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,61600,,'',0
-'3281',300,55000,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,63100,,'',0,9900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,61600,,'',0
+'3466',300,55000,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54600,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,61600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
index 4c2b1add..b7878c0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
@@ -1,5 +1,5 @@
-'3277',300,54700,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61700,,'',0
-'3281',300,55100,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,63200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61700,,'',0
+'3466',300,55100,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54700,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
index b2709154..17b4fd50 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
@@ -1,5 +1,5 @@
-'3277',300,54800,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61800,,'',0
-'3281',300,55100,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63200,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61800,,'',0
+'3466',300,55100,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,54800,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
index 81e64541..f89dd265 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
@@ -1,5 +1,5 @@
-'3277',300,54800,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,61800,,'',0
-'3281',300,55200,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,63300,,'',0,9900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,61800,,'',0
+'3466',300,55200,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54800,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,61800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
index 5ac6f296..60c65bf7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
@@ -1,5 +1,5 @@
-'3277',300,54900,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61900,,'',0
-'3281',300,55200,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3282',300,63300,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61900,,'',0
+'3466',300,55200,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,54900,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
index 83f56834..0ef060a6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
@@ -1,3 +1,3 @@
-'3277',100,54700,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2900,,'',0,6100,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63500,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63400,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
+'3466',100,63500,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54700,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2900,,'',0,6100,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
index ed9524b8..ad85d51d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
@@ -1,4 +1,4 @@
-'3277',100,54800,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63500,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3277',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
+'3466',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54800,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
index 54d5f9b0..7e243e02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
@@ -1,4 +1,4 @@
-'3277',100,54800,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3281',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3282',100,63500,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3277',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
+'3466',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3470',100,54800,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
index 080a06b4..c66299ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
@@ -1,4 +1,4 @@
-'3277',100,54900,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3281',100,63700,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3282',100,63600,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3277',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
+'3466',100,63700,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3470',100,54900,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
index 492b2a6d..154296b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
@@ -1,4 +1,4 @@
-'3277',100,55000,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3281',100,63800,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3282',100,63700,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3277',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
+'3466',100,63800,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3470',100,55000,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
index 7d799ea5..78a6fd26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
@@ -1,8 +1,8 @@
-'3277',100,55100,4,'',0,8700,4,'',0,7200,4,'',0,3400,4,'',0,6300,4,'',0,1700,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,6100,4,'',0,1200,4,'',0,1000,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2300,4,'',0,1900,4,'',0,600,4,'',0,6600,4,'',0,3000,4,'',0,6000,4,'',0,2100,4,'',0,1800,4,'',0,5900,4,'',0,2700,4,'',0,6300,4,'',0,1900,4,'',0,1800,4,'',0,1500,4,'',0,6300,4,'',0,1900,4,'',0,2000,4,'',0,5700,4,'',0,2700,4,'',0,6500,4,'',0,2400,4,'',0,3200,4,'',0,6700,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0
-'3277',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',100,63900,4,'',0,7000,4,'',0,4200,4,'',0,8500,4,'',0,7300,4,'',0,3100,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3300,4,'',0,7200,4,'',0,3100,4,'',0,7700,4,'',0,7300,4,'',0,3500,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7200,4,'',0,3000,4,'',0,7100,4,'',0,2900,4,'',0,7400,4,'',0,2100,4,'',0,7100,4,'',0,3500,4,'',0,6500,4,'',0,2300,4,'',0,7400,4,'',0,2800,4,'',0
-'3281',101,60500,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',100,63800,4,'',0,7200,4,'',0,4100,4,'',0,8400,4,'',0,8600,4,'',0,8800,4,'',0,5000,4,'',0,7700,4,'',0,10100,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,8900,4,'',0,4900,4,'',0,8900,4,'',0,8800,4,'',0,9400,4,'',0,11900,4,'',0
'3282',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,2800,,'',0,9400,,'',0
-'3277',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
-'3277',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
+'3466',100,63900,4,'',0,7000,4,'',0,4200,4,'',0,8500,4,'',0,7300,4,'',0,3100,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3300,4,'',0,7200,4,'',0,3100,4,'',0,7700,4,'',0,7300,4,'',0,3500,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7200,4,'',0,3000,4,'',0,7100,4,'',0,2900,4,'',0,7400,4,'',0,2100,4,'',0,7100,4,'',0,3500,4,'',0,6500,4,'',0,2300,4,'',0,7400,4,'',0,2800,4,'',0
+'3466',101,60500,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',100,55100,4,'',0,8700,4,'',0,7200,4,'',0,3400,4,'',0,6300,4,'',0,1700,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,6100,4,'',0,1200,4,'',0,1000,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2300,4,'',0,1900,4,'',0,600,4,'',0,6600,4,'',0,3000,4,'',0,6000,4,'',0,2100,4,'',0,1800,4,'',0,5900,4,'',0,2700,4,'',0,6300,4,'',0,1900,4,'',0,1800,4,'',0,1500,4,'',0,6300,4,'',0,1900,4,'',0,2000,4,'',0,5700,4,'',0,2700,4,'',0,6500,4,'',0,2400,4,'',0,3200,4,'',0,6700,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0
+'3470',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
index df896d40..7dac630a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
@@ -1,7 +1,7 @@
-'3277',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62300,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3281',701,73900,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2500,,'',0
'3282',701,63800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3281',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3466',701,73900,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',1000701,74000,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3466',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
index a0ff5eff..167bc530 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
@@ -1,7 +1,7 @@
-'3277',100,53700,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62500,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3281',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',100,62500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53700,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',700,60200,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',1000700,70200,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
index 2f535a1e..0a367611 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
@@ -1,7 +1,7 @@
-'3277',100,53800,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62600,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3281',700,70300,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53800,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',700,60300,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',1000700,60300,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70300,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',1000700,70300,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60300,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
index 0dc1592d..8ce993d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
@@ -1,7 +1,7 @@
-'3277',100,53900,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62600,,'',0,3200,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3281',700,70400,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',100,62700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53900,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',700,60400,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',1000700,60400,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70400,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',1000700,70400,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60400,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
index 93eee593..acebcbf8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
@@ -1,4 +1,4 @@
-'3277',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,60600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',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
+'3466',101,60600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
index 7d2c9e69..890271fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
@@ -1,4 +1,4 @@
-'3277',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,60700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',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
+'3466',101,60700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
index 05a808b5..b3f851ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
@@ -1,4 +1,4 @@
-'3277',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,60800,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,2800,,'',0,9400,,'',0
-'3277',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
+'3466',101,60800,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
index 3aee71ba..d0f158c9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
@@ -1,4 +1,4 @@
-'3277',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61000,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61400,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',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
+'3466',101,61000,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
index 82dc0ffa..6ec648aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
@@ -1,7 +1,7 @@
-'3277',100,53600,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62400,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3281',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53600,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
index 76ac5906..6e73c0ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
@@ -1,3 +1,3 @@
-'3277',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62100,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
+'3466',101,61700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
index 9f8173ce..212f2289 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
@@ -1,7 +1,7 @@
-'3277',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62100,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3281',701,73700,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',701,63600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3281',1000701,63700,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3466',701,73700,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',1000701,73800,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3466',1000701,63700,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
index 983585cb..8b1c7560 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
@@ -1,7 +1,7 @@
-'3277',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62200,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3281',701,73800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6500,,'',0
'3282',701,63700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3281',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',1000701,73900,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
index ecebeefb..dd816429 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
@@ -1,7 +1,7 @@
-'3277',101,54500,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,2500,,'',0
-'3281',101,61900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62200,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3281',701,73900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',101,61900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54500,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,2500,,'',0
'3282',701,63800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3281',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',1000701,74000,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
index 8f392d46..0381a81c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
@@ -1,5 +1,5 @@
-'3277',301,60100,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,72300,,'',0
-'3281',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,63100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72300,,'',0
+'3466',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,60100,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,72300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
index f61ab2d1..5cb84f21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
@@ -1,5 +1,5 @@
-'3277',301,60200,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,72400,,'',0
-'3281',301,65200,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,63200,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72400,,'',0
+'3466',301,65200,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,60200,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,72400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
index fca16773..fc6cc77a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
@@ -1,5 +1,5 @@
-'3277',301,60200,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72500,,'',0
-'3281',301,65300,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63200,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,72500,,'',0
+'3466',301,65300,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60200,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
index 6cae24c0..5f9bd1dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
@@ -1,5 +1,5 @@
-'3277',301,60300,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,72500,,'',0
-'3281',301,65300,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3282',301,63300,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,72500,,'',0
+'3466',301,65300,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,60300,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,72500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
index 85054c5e..23668007 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
@@ -1,8 +1,8 @@
-'3277',301,60300,,'',0,5300,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72600,,'',0
-'3281',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63300,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,72600,,'',0
-'3277',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3466',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60300,,'',0,5300,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72600,,'',0
'3282',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3466',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107209
index cdaec255..26c90f8e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107209
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107209
@@ -1,3 +1,3 @@
-'3277',601,61100,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,61900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61500,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3466',601,61900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61100,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
index ed1a1956..c5b7b7b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
@@ -1,8 +1,8 @@
-'3277',301,60500,,'',0,5300,,'',0,14300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72800,,'',0
-'3281',301,65600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63500,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72800,,'',0
-'3277',601,61200,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,62000,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3466',301,65600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60500,,'',0,5300,,'',0,14300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72800,,'',0
'3282',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3466',601,62000,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61200,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
index cc292caa..ea2a52b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
@@ -1,5 +1,5 @@
-'3277',300,54400,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',300,61400,,'',0
-'3281',300,54800,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',300,62900,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',300,61400,,'',0
+'3466',300,54800,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',300,54400,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',300,61400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
index 93ccab7b..aa0d8dde 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
@@ -1,11 +1,11 @@
-'3277',301,60800,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',301,73100,,'',0
-'3281',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63800,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',301,73100,,'',0
-'3277',501,64000,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',501,61100,,'',0
-'3281',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3466',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60800,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',301,73100,,'',0
'3282',501,62600,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,61100,,'',0
-'3277',2400,142900,0,'Ctr Loop',0
+'3466',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,64000,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',501,61100,,'',0
+'3470',2400,142900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
index b5104f1e..c836371f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
@@ -1,21 +1,21 @@
-'3277',300,54200,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3277',301,60900,4,'',0,9300,4,'',0,10400,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,3500,4,'',0,7600,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3900,4,'',0,7500,4,'',0,3600,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,2900,4,'',0,7200,4,'',0,3500,4,'',0,6900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
-'3278',300,61200,,'',0
-'3278',301,73200,4,'',0
-'3281',300,54600,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
-'3281',301,70000,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3600,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,2800,4,'',0,6900,4,'',0,3000,4,'',0,9400,4,'',0,9400,4,'',0
'3282',300,62700,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3282',301,63900,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,9200,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,5100,4,'',0,9000,4,'',0,9900,4,'',0
'3283',300,61200,,'',0
'3283',301,73200,4,'',0
-'3277',500,60900,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3277',501,64100,4,'',0,7000,4,'',0,2800,4,'',0,7400,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,3500,4,'',0,7300,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3100,4,'',0,8600,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
-'3278',500,73200,,'',0
-'3278',501,61200,4,'',0
-'3281',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
-'3281',501,64600,4,'',0,9800,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,9600,4,'',0,9500,4,'',0,9100,4,'',0
+'3466',300,54600,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3466',301,70000,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3600,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,2800,4,'',0,6900,4,'',0,3000,4,'',0,9400,4,'',0,9400,4,'',0
+'3470',300,54200,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3470',301,60900,4,'',0,9300,4,'',0,10400,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,3500,4,'',0,7600,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3900,4,'',0,7500,4,'',0,3600,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,2900,4,'',0,7200,4,'',0,3500,4,'',0,6900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
+'3476',300,61200,,'',0
+'3476',301,73200,4,'',0
'3282',500,63900,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3282',501,62700,4,'',0,9900,4,'',0,9800,4,'',0,9800,4,'',0,9900,4,'',0,8900,4,'',0,4900,4,'',0,9900,4,'',0,9000,4,'',0,9000,4,'',0,9600,4,'',0,9700,4,'',0,9100,4,'',0,10100,4,'',0,10200,4,'',0
'3283',500,73200,,'',0
'3283',501,61200,4,'',0
-'3277',2400,143000,0,'Ctr Loop',0
+'3466',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3466',501,64600,4,'',0,9800,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,9600,4,'',0,9500,4,'',0,9100,4,'',0
+'3470',500,60900,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3470',501,64100,4,'',0,7000,4,'',0,2800,4,'',0,7400,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,3500,4,'',0,7300,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3100,4,'',0,8600,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
+'3476',500,73200,,'',0
+'3476',501,61200,4,'',0
+'3470',2400,143000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
index 4edbe490..c7a4a661 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
@@ -1,14 +1,14 @@
-'3277',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3281',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',401,65100,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61700,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3281',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3277',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90700,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3466',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3466',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61700,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
'3282',3100,112100,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90700,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,83000,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62800,,'',0,3000,,'',0
-'3278',24003100,55900,,'',0
+'3466',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,55900,,'',0
+'3470',24003100,62800,,'',0,3000,,'',0
+'3476',24003100,55900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
index 116d6671..8b7079d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
@@ -1,5 +1,5 @@
-'3277',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3281',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65100,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3281',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3466',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
index 84302100..b1ab1b0d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
@@ -1,5 +1,5 @@
-'3277',401,60200,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',401,65200,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61800,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3281',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60200,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3466',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61800,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
index 04f975f4..eba8f842 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
@@ -1,5 +1,5 @@
-'3277',401,60300,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3281',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65200,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3281',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60300,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3466',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
index 13ecacc5..c32c8322 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
@@ -1,5 +1,5 @@
-'3277',401,60300,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3282',401,65300,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3281',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60300,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3466',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
index c60aa2c4..ae2ce8bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
@@ -1,5 +1,5 @@
-'3277',401,60400,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3281',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65300,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3281',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60400,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3466',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
index 50993c62..1675100d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
@@ -1,5 +1,5 @@
-'3277',401,60400,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65400,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
-'3281',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60400,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3466',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
index 152ec601..48d90651 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
@@ -1,6 +1,6 @@
-'3277',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65500,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',2601,143400,,'',0
-'3278',2601,75300,,'',0
+'3466',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
'3283',2601,75300,,'',0
+'3470',2601,143400,,'',0
+'3476',2601,75300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
index 2faf7446..fa36368a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
@@ -1,6 +1,6 @@
-'3277',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65500,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',2601,143500,,'',0
-'3278',2601,75400,,'',0
+'3466',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
'3283',2601,75400,,'',0
+'3470',2601,143500,,'',0
+'3476',2601,75400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
index 2a4702c6..e00f2c04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
@@ -1,3 +1,3 @@
-'3277',401,60500,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65500,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60500,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
index 1d54b0b3..f1c74444 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
@@ -1,3 +1,3 @@
-'3277',401,60600,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65600,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60600,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
index 74a93b39..d83c709d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
@@ -1,3 +1,3 @@
-'3277',401,60700,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65700,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60700,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
index 9393fc3b..ca757f01 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
@@ -1,3 +1,3 @@
-'3277',401,60700,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65700,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60700,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
index e1349d77..f2d544b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
@@ -1,6 +1,6 @@
-'3277',401,60800,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65800,,'',0,20100,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3277',2601,143800,,'',0
-'3278',2601,75700,,'',0
+'3466',401,61300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60800,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
'3283',2601,75700,,'',0
+'3470',2601,143800,,'',0
+'3476',2601,75700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
index 1a69fcc9..e5a54e8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
@@ -1,3 +1,3 @@
-'3277',401,60900,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65900,,'',0,24100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60900,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
index 8a72beec..d4398c89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
@@ -1,3 +1,3 @@
-'3277',401,60900,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,65900,,'',0,24100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,60900,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
index bade437d..e577ed7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
@@ -1,3 +1,3 @@
-'3277',401,61000,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,70000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,61000,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
index 60fd3a45..e16d8d5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
@@ -1,3 +1,3 @@
-'3277',401,61000,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3281',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',401,70000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',401,61000,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
index 93a60412..d2fd6fe0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
@@ -1,3 +1,3 @@
-'3277',400,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
index 6167615d..201ea3bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
@@ -1,3 +1,3 @@
-'3277',400,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70200,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
index b850ca22..e80e422d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
@@ -1,3 +1,3 @@
-'3277',400,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70200,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
index 8e82b362..be4ba454 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
@@ -1,3 +1,3 @@
-'3277',400,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
index 932a3828..f109a251 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
@@ -1,3 +1,3 @@
-'3277',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
index 932a3828..f109a251 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
@@ -1,3 +1,3 @@
-'3277',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
index 83adcb23..c74c2bdf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
@@ -1,3 +1,3 @@
-'3277',400,61600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70600,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,62100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
index eb0632b8..b28deeae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
@@ -1,3 +1,3 @@
-'3277',400,61700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70700,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,62200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
index b4148c11..6f170997 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
@@ -1,3 +1,3 @@
-'3277',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70800,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3466',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
index b4148c11..6f170997 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
@@ -1,3 +1,3 @@
-'3277',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70800,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3466',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
index 3d605fd5..20c64a03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
@@ -1,3 +1,3 @@
-'3277',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70900,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3466',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
index 3d605fd5..20c64a03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
@@ -1,3 +1,3 @@
-'3277',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70900,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3466',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
index 2b03a444..7f5e7041 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
@@ -1,3 +1,3 @@
-'3277',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,71000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3466',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
index a8da2021..d49587fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
@@ -1,6 +1,6 @@
-'3277',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,71000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',2600,144600,0,'Montrose Exch Only',0
-'3278',2600,80400,,'',0
+'3466',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
'3283',2600,80400,,'',0
+'3470',2600,144600,0,'Montrose Exch Only',0
+'3476',2600,80400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
index 44044d61..a54574f9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
@@ -1,6 +1,6 @@
-'3277',400,62100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,71100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',2600,144700,0,'Montrose Exch Only',0
-'3278',2600,80500,,'',0
+'3466',400,62600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,62100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
'3283',2600,80500,,'',0
+'3470',2600,144700,0,'Montrose Exch Only',0
+'3476',2600,80500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
index e81c957f..3a6297a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
@@ -1,5 +1,5 @@
-'3277',400,62200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62700,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3282',400,71200,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3277',1500,64600,,'',0,8400,,'',0,12100,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
-'3281',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',400,62700,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3470',400,62200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3466',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64600,,'',0,8400,,'',0,12100,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
index b192136f..6ffb106d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
@@ -1,5 +1,5 @@
-'3277',400,62300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,62800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,71300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',1500,64600,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
-'3281',1500,93100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',400,62800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,62300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3466',1500,93100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64600,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
index a847190c..8821c51d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
@@ -1,5 +1,5 @@
-'3277',400,62400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
-'3281',400,62900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,5900,,'',0
'3282',400,71400,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',1500,64700,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
-'3281',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',400,62900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,5900,,'',0
+'3470',400,62400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
+'3466',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64700,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
index 13c841e6..b2ba358a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
@@ -1,5 +1,5 @@
-'3277',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
-'3281',400,62900,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,5900,,'',0
'3282',400,71400,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3277',1500,64800,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8600,,'',0
-'3281',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',400,62900,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,5900,,'',0
+'3470',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
+'3466',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64800,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
index 6704520e..b64d3507 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
@@ -1,5 +1,5 @@
-'3277',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
-'3281',400,63000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,9900,,'',0
'3282',400,71500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3277',1500,64800,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
-'3281',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',400,63000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14500,,'',0,9900,,'',0
+'3470',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12300,0,'Montrose Exch',0
+'3466',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64800,,'',0,8400,,'',0,12200,,'',0,68200,,'',0,20700,,'',0,8700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
index c5167444..ca6b57de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
@@ -1,13 +1,13 @@
-'3277',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
'3282',400,71500,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3277',1500,64900,,'',0,8400,,'',0,12200,,'',0,68100,,'',0,20800,,'',0,8600,,'',0
-'3281',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',3101,64000,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,81400,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3466',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
+'3470',400,62500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11500,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3466',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64900,,'',0,8400,,'',0,12200,,'',0,68100,,'',0,20800,,'',0,8600,,'',0
'3282',3101,102300,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71200,,'',0
-'3281',1003101,84700,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81400,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,64000,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,92000,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71200,,'',0
+'3466',1003101,84700,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
index d9c0167d..ddfb098e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
@@ -1,8 +1,8 @@
-'3277',3101,63900,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,81300,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3282',3101,102200,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,74100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,71100,,'',0
-'3281',1003101,84600,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81300,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,63900,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,91900,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,71100,,'',0
+'3466',1003101,84600,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,74100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,71100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
index 1c43cce6..eea0e11d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
@@ -1,8 +1,8 @@
-'3277',3101,63800,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,81200,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3282',3101,102100,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3277',1003101,73900,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10700,,'',0,8500,,'',0,12200,,'',0
-'3278',1003101,70900,,'',0
-'3281',1003101,84500,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,81200,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,63800,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,91800,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,70900,,'',0
+'3466',1003101,84500,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,73900,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10700,,'',0,8500,,'',0,12200,,'',0
+'3476',1003101,70900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
index e240821c..2af0b1b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
@@ -1,9 +1,9 @@
-'3277',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3281',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3466',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',400,71800,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3281',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3282',901,70400,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3278',2600,81900,,'',0
+'3466',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3283',2600,81900,,'',0
+'3476',2600,81900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
index 058f7286..56d52ec9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
@@ -1,6 +1,6 @@
-'3277',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60400,,'',0
-'3281',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3282',501,61900,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60400,,'',0
-'3277',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
+'3466',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60400,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
index 78613a8d..d07f3745 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
@@ -1,6 +1,6 @@
-'3277',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60400,,'',0
-'3281',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3282',501,61900,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60400,,'',0
-'3277',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
+'3466',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60400,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
index e838bf1c..654b8fa7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
@@ -1,5 +1,5 @@
-'3277',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60500,,'',0
-'3281',501,63800,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,61900,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60500,,'',0
+'3466',501,63800,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
index 87427a3a..c0d4ae7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
@@ -1,5 +1,5 @@
-'3277',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60500,,'',0
-'3281',501,63900,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3282',501,62000,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60500,,'',0
+'3466',501,63900,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
index e144e59a..19463fe2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
@@ -1,5 +1,5 @@
-'3277',501,63400,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60600,,'',0
-'3281',501,63900,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60600,,'',0
+'3466',501,63900,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63400,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
index b8e2e89a..055a0981 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
@@ -1,5 +1,5 @@
-'3277',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60700,,'',0
-'3281',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62100,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60700,,'',0
+'3466',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
index f136ba4b..9af5b77c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
@@ -1,5 +1,5 @@
-'3277',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60700,,'',0
-'3281',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62100,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60700,,'',0
+'3466',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
index 277be7e9..9062d82d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
@@ -1,5 +1,5 @@
-'3277',501,63600,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60800,,'',0
-'3281',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60800,,'',0
+'3466',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63600,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
index bbcda6de..165c3902 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
@@ -1,5 +1,5 @@
-'3277',501,63700,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60800,,'',0
-'3281',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62300,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60800,,'',0
+'3466',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63700,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
index 2c7d5adc..e64afc61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
@@ -1,5 +1,5 @@
-'3277',501,63700,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60900,,'',0
-'3281',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62300,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60900,,'',0
+'3466',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63700,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
index 614756a6..098f7c25 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
@@ -1,5 +1,5 @@
-'3277',501,63900,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,61000,,'',0
-'3281',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62500,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,61000,,'',0
+'3466',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63900,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,61000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
index cced40a8..f6e26308 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
@@ -1,5 +1,5 @@
-'3277',501,63900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',501,61000,,'',0
-'3281',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62500,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,61000,,'',0
+'3466',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',501,61000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
index 65ff89cd..b40e8b34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
@@ -1,5 +1,5 @@
-'3277',501,64000,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,61100,,'',0
-'3281',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62600,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,61100,,'',0
+'3466',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,64000,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,61100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
index 91624c2e..109c73eb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
@@ -1,9 +1,9 @@
-'3277',601,61400,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,62200,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3277',1701,63200,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60400,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3466',601,62200,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61400,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3470',1701,63200,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90500,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',2401,80100,0,'Ctr Loop',0
-'3277',1002101,72400,,'',0
+'3466',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60400,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
+'3470',2401,80100,0,'Ctr Loop',0
+'3470',1002101,72400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
index d12d84ea..a7fd6c59 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
@@ -1,9 +1,9 @@
-'3277',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',1701,63300,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74300,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3466',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3470',1701,63300,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90500,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',2401,80200,0,'Ctr Loop',0
-'3277',1002101,72500,,'',0
+'3466',2101,74300,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
+'3470',2401,80200,0,'Ctr Loop',0
+'3470',1002101,72500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
index c29b88d1..b91224b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
@@ -1,5 +1,5 @@
-'3277',1701,63300,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,4100,,'',0,9600,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74400,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',1701,63300,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90600,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,72500,,'',0
+'3466',2101,74400,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,4100,,'',0,9600,,'',0,15900,,'',0,11100,,'',0
+'3470',1002101,72500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
index 71fc7428..e7b7febc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
@@ -1,5 +1,5 @@
-'3277',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3277',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
-'3281',2100,82600,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3282',2100,94900,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,152500,,'',0,9500,,'',0
+'3466',2100,82600,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
+'3470',1002100,152500,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
index b9dca99d..8a99b6a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
@@ -1,4 +1,4 @@
-'3277',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3277',2401,80300,0,'Ctr Loop',0
+'3466',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3470',2401,80300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
index 5d20a4e2..fbb880fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
@@ -1,4 +1,4 @@
-'3277',601,61600,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62400,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3277',2401,80400,0,'Ctr Loop',0
+'3466',601,62400,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61600,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3470',2401,80400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
index c446f190..23941562 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
@@ -1,5 +1,5 @@
-'3277',500,61200,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73600,,'',0
-'3281',500,70300,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
'3282',500,64200,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',500,73600,,'',0
+'3466',500,70300,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61200,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
index 4842f35b..4f89d888 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
@@ -1,5 +1,5 @@
-'3277',500,61300,,'',0,9300,,'',0,10500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73600,,'',0
-'3281',500,70300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
'3282',500,64200,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3283',500,73600,,'',0
+'3466',500,70300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
+'3470',500,61300,,'',0,9300,,'',0,10500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
index bbae0610..af3e9a99 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
@@ -1,5 +1,5 @@
-'3277',500,61400,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73900,,'',0
-'3281',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64400,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',500,73900,,'',0
+'3466',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61400,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
index 26fcd8da..2742a4c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
@@ -1,5 +1,5 @@
-'3277',500,61600,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74000,,'',0
-'3281',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64500,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74000,,'',0
+'3466',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61600,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
index d0fab376..c688a8d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
@@ -1,5 +1,5 @@
-'3277',500,61600,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74100,,'',0
-'3281',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64500,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74100,,'',0
+'3466',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61600,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
index 79ce8110..471f7b16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
@@ -1,5 +1,5 @@
-'3277',500,61700,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74200,,'',0
-'3281',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64600,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74200,,'',0
+'3466',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61700,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
index 9590482e..41b0ebdc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
@@ -1,6 +1,6 @@
-'3277',500,61800,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74300,,'',0
-'3281',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64700,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74300,,'',0
-'3277',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
+'3466',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61800,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74300,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
index e4f29014..15a7a21a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
@@ -1,6 +1,6 @@
-'3277',500,61900,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,74400,,'',0
-'3281',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64800,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3283',500,74400,,'',0
-'3277',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
+'3466',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61900,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,74400,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
index 94cbcec9..c22c8c47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
@@ -1,4 +1,4 @@
-'3277',601,55800,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3282',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74000,0,'Ctr Loop',0
+'3466',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55800,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3470',2401,74000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
index f309661f..96e22f6c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
@@ -1,4 +1,4 @@
-'3277',601,55800,,'',0,8100,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,15500,,'',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
-'3281',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3282',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74000,0,'Ctr Loop',0
+'3466',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55800,,'',0,8100,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
index 978eae93..b1fec62b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
@@ -1,4 +1,4 @@
-'3277',601,55900,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74100,0,'Ctr Loop',0
+'3466',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,55900,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
index db9ec6d0..59233cd0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
@@ -1,4 +1,4 @@
-'3277',601,55900,,'',0,8100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74200,0,'Ctr Loop',0
+'3466',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,55900,,'',0,8100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74200,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
index 8c36be7a..61d9a126 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
@@ -1,4 +1,4 @@
-'3277',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74300,0,'Ctr Loop',0
+'3466',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
index 8c36be7a..61d9a126 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
@@ -1,4 +1,4 @@
-'3277',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74300,0,'Ctr Loop',0
+'3466',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
index 5c40a363..cbde72e4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
@@ -1,4 +1,4 @@
-'3277',601,60100,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61000,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74400,0,'Ctr Loop',0
+'3466',601,61000,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60100,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
index 6de637dc..47b4a0c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
@@ -1,4 +1,4 @@
-'3277',601,60200,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74500,0,'Ctr Loop',0
+'3466',601,61100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60200,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
index f89ad998..ffcd39e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
@@ -1,4 +1,4 @@
-'3277',601,60300,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61100,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
'3282',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,74700,0,'Ctr Loop',0
+'3466',601,61100,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60300,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
index 4ca66dd1..2d55bc7f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
@@ -1,4 +1,4 @@
-'3277',601,60300,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10400,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3282',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74700,0,'Ctr Loop',0
+'3466',601,61200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10400,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60300,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
index 4be592b1..9b5362e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
@@ -1,4 +1,4 @@
-'3277',601,60400,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61200,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
'3282',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,74800,0,'Ctr Loop',0
+'3466',601,61200,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
+'3470',601,60400,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
index b7ff8fd0..1b9329b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
@@ -1,4 +1,4 @@
-'3277',601,60400,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3282',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2401,74900,0,'Ctr Loop',0
+'3466',601,61300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60400,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,74900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
index 9f2756e4..73c6f444 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
@@ -1,4 +1,4 @@
-'3277',601,60500,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61300,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75000,0,'Ctr Loop',0
+'3466',601,61300,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60500,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
index 8e09e292..bf0226af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
@@ -1,4 +1,4 @@
-'3277',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75100,0,'Ctr Loop',0
+'3466',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
index 8e09e292..bf0226af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
@@ -1,4 +1,4 @@
-'3277',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75100,0,'Ctr Loop',0
+'3466',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
index 61561f33..6cba1edb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
@@ -1,4 +1,4 @@
-'3277',601,60700,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75200,0,'Ctr Loop',0
+'3466',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60700,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75200,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
index de750f32..7da82b8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
@@ -1,4 +1,4 @@
-'3277',601,60700,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3277',2401,75300,0,'Ctr Loop',0
+'3466',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60700,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
index 754aba9d..fda7ea1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
@@ -1,4 +1,4 @@
-'3277',601,60800,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61600,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75300,0,'Ctr Loop',0
+'3466',601,61600,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60800,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
index d3ac2923..9a54f18b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
@@ -1,4 +1,4 @@
-'3277',601,60900,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3277',2401,75400,0,'Ctr Loop',0
+'3466',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60900,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
index 7bad80c0..9563468a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
@@ -1,4 +1,4 @@
-'3277',601,60900,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3277',2401,75500,0,'Ctr Loop',0
+'3466',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,60900,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3470',2401,75500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
index 29f6c5f8..0954a241 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
@@ -1,7 +1,7 @@
-'3277',601,61000,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61800,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3277',2201,151900,,'',0
-'3278',2201,82600,,'',0
+'3466',601,61800,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61000,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
'3283',2201,85600,,'',0
-'3277',2401,75600,0,'Ctr Loop',0
+'3470',2201,151900,,'',0
+'3476',2201,82600,,'',0
+'3470',2401,75600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
index bc8f8b6b..10cec041 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
@@ -1,7 +1,7 @@
-'3277',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3281',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3277',2201,152000,,'',0
-'3278',2201,82700,,'',0
+'3466',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
'3283',2201,85700,,'',0
-'3277',2401,75700,0,'Ctr Loop',0
+'3470',2201,152000,,'',0
+'3476',2201,82700,,'',0
+'3470',2401,75700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
index 3c14714f..894c3ba6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
@@ -1,4 +1,4 @@
-'3277',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',2401,80500,0,'Ctr Loop',0
+'3466',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3470',2401,80500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
index 3c14714f..894c3ba6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
@@ -1,4 +1,4 @@
-'3277',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',2401,80500,0,'Ctr Loop',0
+'3466',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3470',2401,80500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
index 19a9e14d..28b1bd49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
@@ -1,4 +1,4 @@
-'3277',601,61800,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62600,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3277',2401,80600,0,'Ctr Loop',0
+'3466',601,62600,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61800,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3470',2401,80600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
index 6ac31390..d166a4a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
@@ -1,3 +1,3 @@
-'3277',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3466',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
index a570e0d9..75515549 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
@@ -1,3 +1,3 @@
-'3277',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3466',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
index 92fd4668..1766ba5d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
@@ -1,3 +1,3 @@
-'3277',601,61900,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62700,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
'3282',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3466',601,62700,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3470',601,61900,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
index 85ffe23b..dc41d3dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
@@ -1,3 +1,3 @@
-'3277',601,62000,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3281',601,62800,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
'3282',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3466',601,62800,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3470',601,62000,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
index 78d1ebef..f115942b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
@@ -1,3 +1,3 @@
-'3277',601,62100,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3281',601,62900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3282',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3466',601,62900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,62100,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
index 36e26ae3..4457ef5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
@@ -1,7 +1,7 @@
-'3277',700,62100,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3281',700,70700,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',700,60700,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3277',1600,73600,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3277',1000700,73600,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,60700,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70700,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62100,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73600,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
'3282',1000700,70700,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60700,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',1000700,73600,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
index a0b712bc..194ca4a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
@@ -1,7 +1,7 @@
-'3277',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3281',700,70800,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',700,60800,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3277',1600,73700,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3277',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3466',700,70800,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73700,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
'3282',1000700,70800,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
index c02c1119..436774c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
@@ -1,7 +1,7 @@
-'3277',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,70800,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',700,60800,,'',0,20000,,'',0,15000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'3277',1600,73700,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3277',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,70800,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73700,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3282',1000700,70800,,'',0,19500,,'',0,15500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
index 9537c5d0..bf7c53a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
@@ -1,7 +1,7 @@
-'3277',700,62400,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71000,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',700,61000,,'',0,20000,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,73900,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3277',1000700,73900,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,61000,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71000,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62400,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,73900,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3282',1000700,71000,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61000,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,73900,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
index 118f7436..1dd2fbaf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
@@ -1,6 +1,6 @@
-'3277',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61000,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,61000,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71100,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61000,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
index 9492e75f..df4d4009 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
@@ -1,6 +1,6 @@
-'3277',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61100,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71200,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
index ec2595d7..814e7186 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
@@ -1,6 +1,6 @@
-'3277',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61100,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3281',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71200,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
index c52ab7fc..28ada0b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
@@ -1,6 +1,6 @@
-'3277',700,62700,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71300,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61200,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74200,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3281',1000700,61200,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71300,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62700,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71300,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61200,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74200,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
index e0d7d41e..eb9a67b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
@@ -1,6 +1,6 @@
-'3277',700,62700,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3281',700,71300,,'',0,14600,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3281',1000700,61200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71300,,'',0,14600,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,62700,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
'3282',1000700,71300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
index bc8bbdda..01799ac8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
@@ -1,6 +1,6 @@
-'3277',700,62800,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71400,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61300,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3281',1000700,61300,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71400,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62800,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71400,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61300,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
index 48eb7dc0..09f2042d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
@@ -1,6 +1,6 @@
-'3277',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,26900,,'',0
-'3281',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61400,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3281',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,26900,,'',0
'3282',1000700,71500,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
index a598a435..c5f69eca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
@@ -1,6 +1,6 @@
-'3277',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61400,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3281',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71500,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
index 1e0fdb53..75c76896 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
@@ -1,7 +1,7 @@
-'3277',700,63000,,'',0,21000,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71600,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3282',700,61500,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,74500,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3277',1000700,74500,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,20000,,'',0
-'3281',1000700,61500,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71600,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3470',700,63000,,'',0,21000,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,20000,,'',0,27000,,'',0
+'3470',1600,74500,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3282',1000700,71600,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61500,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74500,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
index b12973aa..e9653597 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
@@ -1,7 +1,7 @@
-'3277',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3281',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,74600,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3277',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3281',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
+'3470',1600,74600,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3282',1000700,71700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
index 220fb434..abf33a0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
@@ -1,7 +1,7 @@
-'3277',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3281',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,74700,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
-'3277',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3281',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
+'3470',1600,74700,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
'3282',1000700,71700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
index 1cf97b9f..33ddd8d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
@@ -1,7 +1,7 @@
-'3277',700,63200,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,26900,,'',0
-'3281',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,74700,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3277',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19800,,'',0
-'3281',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63200,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,26900,,'',0
+'3470',1600,74700,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3282',1000700,71800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
index 5c128953..85184414 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
@@ -1,7 +1,7 @@
-'3277',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,27000,,'',0
-'3281',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1600,74800,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
-'3277',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19900,,'',0
-'3281',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,27000,,'',0
+'3470',1600,74800,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
'3282',1000700,71800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
index 30382d02..4d686630 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
@@ -1,6 +1,6 @@
-'3277',700,63300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,26900,,'',0
-'3281',700,71900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74900,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19800,,'',0
-'3281',1000700,61800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,26900,,'',0
'3282',1000700,71900,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74900,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
index 2b310ac0..f4ef321b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
@@ -1,6 +1,6 @@
-'3277',700,63400,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,19900,4,'',0,26900,4,'',0
-'3277',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',700,72000,4,'',0,18600,4,'',0,21500,4,'',0,20600,4,'',0,21500,4,'',0,20900,4,'',0,20000,4,'',0,9800,4,'',0,17000,4,'',0
-'3281',701,72000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',700,61900,4,'',0,20200,4,'',0,19000,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0,12500,4,'',0
'3282',701,61900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3466',700,72000,4,'',0,18600,4,'',0,21500,4,'',0,20600,4,'',0,21500,4,'',0,20900,4,'',0,20000,4,'',0,9800,4,'',0,17000,4,'',0
+'3466',701,72000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',700,63400,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,19900,4,'',0,26900,4,'',0
+'3470',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
index 1a2a71b0..a89cf67b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
@@ -1,6 +1,6 @@
-'3277',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
index 1a2a71b0..a89cf67b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
@@ -1,6 +1,6 @@
-'3277',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
index 691b895e..4633be67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
@@ -1,6 +1,6 @@
-'3277',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
index 691b895e..4633be67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
@@ -1,6 +1,6 @@
-'3277',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
index 88cf8ce7..e2c4f1d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
@@ -1,6 +1,6 @@
-'3277',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3466',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
index 1dcd9642..dc0c67bf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
@@ -1,6 +1,6 @@
-'3277',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
index 393d055a..202f240e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
@@ -1,6 +1,6 @@
-'3277',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75400,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3466',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,75400,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
index a44c8a46..0062f55b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
@@ -1,6 +1,6 @@
-'3277',701,63800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62300,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75500,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72400,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75500,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
index ed4e5284..acb2d466 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
@@ -1,6 +1,6 @@
-'3277',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62300,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3466',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72400,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,75500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
index 3c58fe02..da795d2d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
@@ -1,6 +1,6 @@
-'3277',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62400,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62400,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3466',701,72500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
'3282',1000701,72500,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62400,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
index 91e51ea6..73132cfc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
@@ -1,4 +1,4 @@
-'3277',1601,75400,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
-'3277',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62500,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1601,75400,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
'3282',1000701,72600,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000701,62500,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
index 7e0f10f8..ce2b8315 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
@@ -1,4 +1,4 @@
-'3277',1601,75500,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
-'3277',1000701,75900,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1601,75500,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
'3282',1000701,72700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,75900,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
index d2775f17..18be9244 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
@@ -1,7 +1,7 @@
-'3277',201,51600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',201,60600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,62100,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3277',1601,75600,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80000,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3466',201,60600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,51600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3470',1601,75600,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,72800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3470',1000701,80000,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
index cb55312d..e76ffbd6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
@@ -1,4 +1,4 @@
-'3277',1601,75700,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1601,75700,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,72900,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
index 4397fd4a..769816f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
@@ -1,4 +1,4 @@
-'3277',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,72900,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
index d43f48f8..9bef12fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
@@ -1,7 +1,7 @@
-'3277',701,64300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3466',701,72800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,64300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3470',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,73000,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
index b5f61c81..5ae26ec7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
@@ -1,7 +1,7 @@
-'3277',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3282',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3466',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3470',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3470',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,73000,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
index bc7e29e1..3d8f8dd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
@@ -1,7 +1,7 @@
-'3277',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3282',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3466',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3470',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3470',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,73000,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
index 5d204c33..a11e9833 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
@@ -1,7 +1,7 @@
-'3277',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3282',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3277',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3466',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3470',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3470',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3282',1000701,73100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3470',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
index 412f8bbf..08d67e8a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
@@ -1,6 +1,6 @@
-'3277',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3282',701,62900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3470',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73100,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107358 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107358
index de39dd48..d133ee82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107358
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107358
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107359 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107359
index de39dd48..d133ee82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107359
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107359
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107360
index 13765208..87fdb920 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107360
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107361
index 13765208..87fdb920 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107361
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107363
index 363aaed5..ad0106ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107363
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107364 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107364
index 48b77ec0..b8728c24 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107364
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107364
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107365
index 5710d052..7587cdab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107365
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107366 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107366
index b9f47179..6fa4d86b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107366
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107366
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107367
index 2c32a4a2..ae157644 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107367
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107368
index 141c45b7..c247ee0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107368
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107369
index b3af68e2..0a7475ee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107369
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107370
index 8e6bf552..92e3176c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107370
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107370
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107371 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107371
index bc685ee2..b6c9b8be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107371
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107371
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107372 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107372
index fde84add..7b37a93f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107372
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107372
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107373 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107373
index 9482933c..91312ac1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107373
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107373
@@ -1 +1 @@
-'3277',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
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
index 952b2635..3dbe2df5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
@@ -1,5 +1,5 @@
-'3277',1501,62000,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3277',2600,144700,0,'Montrose Exch Only',0
-'3278',2600,80500,,'',0
+'3466',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62000,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
'3283',2600,80500,,'',0
+'3470',2600,144700,0,'Montrose Exch Only',0
+'3476',2600,80500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
index bbeb0006..bafed010 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
@@ -1,5 +1,5 @@
-'3277',1500,64300,,'',0,8400,,'',0,12100,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',2601,143300,,'',0
-'3278',2601,75200,,'',0
+'3466',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64300,,'',0,8400,,'',0,12100,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
'3283',2601,75200,,'',0
+'3470',2601,143300,,'',0
+'3476',2601,75200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
index cdfac4b8..f0bdbacc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
@@ -1,2 +1,2 @@
-'3277',1500,63800,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63800,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
index 05a4ccbb..25afe10d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
@@ -1,2 +1,2 @@
-'3277',1501,62400,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62400,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
index c4696a2e..df84c228 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
@@ -1,2 +1,2 @@
-'3277',1501,62500,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62500,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
index daecb492..7fadd844 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
@@ -1,2 +1,2 @@
-'3277',1501,62600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
index 93030116..76708cc8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
@@ -1,2 +1,2 @@
-'3277',1501,62800,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62800,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
index e06cc9f6..b0cb24e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
@@ -1,2 +1,2 @@
-'3277',1501,62900,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62900,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
index 8a94e1e9..c76ffeff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
@@ -1,2 +1,2 @@
-'3277',1501,63000,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1501,63000,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
index ec315851..2b84dc2c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
@@ -1,2 +1,2 @@
-'3277',1501,63100,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1501,63100,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
index 5be579f3..995a0453 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
@@ -1,4 +1,4 @@
-'3277',1500,63300,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3277',1501,63300,4,'',0,8500,4,'',0,11800,4,'',0,68400,4,'',0,20600,4,'',0,8900,4,'',0
-'3281',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3281',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3466',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3470',1500,63300,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3470',1501,63300,4,'',0,8500,4,'',0,11800,4,'',0,68400,4,'',0,20600,4,'',0,8900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
index ca0b27d0..737278ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
@@ -1,2 +1,2 @@
-'3277',1500,63400,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63400,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
index 0c52e857..d5932788 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
@@ -1,2 +1,2 @@
-'3277',1500,63500,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63500,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
index 7213a8cb..d530130f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
@@ -1,2 +1,2 @@
-'3277',1500,63600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
index 520928ad..2000dba8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
@@ -1,2 +1,2 @@
-'3277',1500,63700,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63700,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
index ac1aa39e..90024cf5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
@@ -1,3 +1,3 @@
-'3277',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',2600,145700,0,'Montrose Exch Only',0
+'3466',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3470',2600,145700,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
index de4b70fb..7d6f150e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
@@ -1,5 +1,5 @@
-'3277',1500,64400,,'',0,8400,,'',0,12100,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',2601,143400,,'',0
-'3278',2601,75300,,'',0
+'3466',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64400,,'',0,8400,,'',0,12100,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
'3283',2601,75300,,'',0
+'3470',2601,143400,,'',0
+'3476',2601,75300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
index 93ad08fd..30533c96 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
@@ -1,6 +1,6 @@
-'3277',701,64800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',701,63400,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
-'3281',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73600,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
index 5e2f2e4d..e6cd74f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
@@ -1,6 +1,6 @@
-'3277',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',701,63200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63300,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73400,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63300,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107394 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107394
index 2d8866b6..b104950c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107394
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107394
@@ -1 +1 @@
-'3277',1600,74000,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
+'3470',1600,74000,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107395 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107395
index 5a150354..fe082e61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107395
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107395
@@ -1 +1 @@
-'3277',1600,74200,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
+'3470',1600,74200,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107396 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107396
index 6aae3219..d5c96819 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107396
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107396
@@ -1 +1 @@
-'3277',1600,74200,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3470',1600,74200,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107397 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107397
index 405b9e79..7bb41e67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107397
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107397
@@ -1 +1 @@
-'3277',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3470',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107398 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107398
index 405b9e79..7bb41e67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107398
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107398
@@ -1 +1 @@
-'3277',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3470',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107399 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107399
index a0cc8fa9..29cda3c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107399
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107399
@@ -1 +1 @@
-'3277',1600,74400,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
+'3470',1600,74400,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107400 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107400
index 60353589..408ddcc8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107400
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107400
@@ -1,2 +1,2 @@
-'3277',1600,74900,4,'',0,16300,4,'',0,64200,4,'',0,8600,4,'',0
-'3277',1601,74900,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3470',1600,74900,4,'',0,16300,4,'',0,64200,4,'',0,8600,4,'',0
+'3470',1601,74900,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107401 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107401
index c2fcf7be..da84fdf4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107401
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107401
@@ -1 +1 @@
-'3277',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3470',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107402 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107402
index c2fcf7be..da84fdf4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107402
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107402
@@ -1 +1 @@
-'3277',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3470',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107403 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107403
index efcd7354..d2f26387 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107403
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107403
@@ -1 +1 @@
-'3277',1601,75100,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3470',1601,75100,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107404 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107404
index 9f99734c..00502ceb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107404
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107404
@@ -1 +1 @@
-'3277',1601,75200,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3470',1601,75200,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107405 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107405
index fc0c986b..ac8a5a45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107405
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107405
@@ -1 +1 @@
-'3277',1601,80100,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
+'3470',1601,80100,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107406 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107406
index 413043d5..da1bdd08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107406
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107406
@@ -1 +1 @@
-'3277',1601,80200,,'',0,12100,,'',0,68300,,'',0,4700,,'',0
+'3470',1601,80200,,'',0,12100,,'',0,68300,,'',0,4700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107407 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107407
index 0e209c80..756e5670 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107407
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107407
@@ -1 +1 @@
-'3277',1601,80300,,'',0,12200,,'',0,68200,,'',0,4800,,'',0
+'3470',1601,80300,,'',0,12200,,'',0,68200,,'',0,4800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
index 4bca2d6d..529eef3f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
@@ -1,6 +1,6 @@
-'3277',1701,63100,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60300,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3281',2101,74200,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',1701,63100,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90400,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',2401,80000,0,'Ctr Loop',0
-'3277',1002101,72300,,'',0
+'3466',2101,74200,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60300,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
+'3470',2401,80000,0,'Ctr Loop',0
+'3470',1002101,72300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
index cf99a0bc..4296360f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
@@ -1,5 +1,5 @@
-'3277',1701,63400,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60600,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74500,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',1701,63400,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90700,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,72600,,'',0
+'3466',2101,74500,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60600,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3470',1002101,72600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
index 3185f8da..89cd407d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
@@ -1,5 +1,5 @@
-'3277',1701,63500,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2101,60700,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',1701,63500,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3282',2101,90800,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,72700,,'',0
+'3466',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,60700,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3470',1002101,72700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107411 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107411
index 2571b5c1..5d66e5d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107411
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107411
@@ -1 +1 @@
-'3277',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
+'3470',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107412 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107412
index a42684af..825a8c2f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107412
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107412
@@ -1 +1 @@
-'3277',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107413 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107413
index eeed285b..f9721ffc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107413
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107413
@@ -1 +1 @@
-'3277',1700,64300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
index 0aa849f4..0bff2bcb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
@@ -1,5 +1,5 @@
-'3277',1700,64400,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3277',2100,64900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82300,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',1700,64400,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3282',2100,94600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,152000,,'',0,9500,,'',0
+'3466',2100,82300,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,152000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
index d2cb5f50..8c474639 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
@@ -1,5 +1,5 @@
-'3277',1700,64500,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3277',2100,65000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82400,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',1700,64500,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3282',2100,94700,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,152100,,'',0,9500,,'',0
+'3466',2100,82400,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,152100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107416 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107416
index 2571b5c1..5d66e5d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107416
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107416
@@ -1 +1 @@
-'3277',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
+'3470',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107417 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107417
index e8d138b8..fb06636e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107417
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107417
@@ -1,2 +1,2 @@
-'3277',1700,63700,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,3600,,'',0
-'3277',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76500,4,'',0,7700,4,'',0,4300,4,'',0,8000,4,'',0,3600,4,'',0
+'3470',1700,63700,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,3600,,'',0
+'3470',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76500,4,'',0,7700,4,'',0,4300,4,'',0,8000,4,'',0,3600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107418 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107418
index 8f7c16eb..3263ff67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107418
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107418
@@ -1 +1 @@
-'3277',1700,63800,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,63800,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107419 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107419
index 64451624..4a95d513 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107419
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107419
@@ -1 +1 @@
-'3277',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107420 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107420
index 64451624..4a95d513 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107420
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107420
@@ -1 +1 @@
-'3277',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107421 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107421
index f508c152..2b0879f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107421
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107421
@@ -1 +1 @@
-'3277',1700,64000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107422 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107422
index 890b8f7c..b8d0e4da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107422
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107422
@@ -1 +1 @@
-'3277',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107423 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107423
index 890b8f7c..b8d0e4da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107423
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107423
@@ -1 +1 @@
-'3277',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107424 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107424
index a42684af..825a8c2f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107424
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107424
@@ -1 +1 @@
-'3277',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3470',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
index baee7504..7713eb30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
@@ -1,5 +1,5 @@
-'3277',1700,64600,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3277',2100,65100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20600,,'',0,9100,,'',0,11600,,'',0,14900,,'',0
-'3281',2100,82500,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',1700,64600,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3282',2100,94800,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,152200,,'',0,9500,,'',0
+'3466',2100,82500,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20600,,'',0,9100,,'',0,11600,,'',0,14900,,'',0
+'3470',1002100,152200,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
index 64909e7f..3b106395 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
@@ -1,5 +1,5 @@
-'3277',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3277',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13300,,'',0,20500,,'',0,9100,,'',0,15600,,'',0,10900,,'',0
-'3281',2100,82600,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3282',2100,94900,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,152300,,'',0,9500,,'',0
+'3466',2100,82600,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13300,,'',0,20500,,'',0,9100,,'',0,15600,,'',0,10900,,'',0
+'3470',1002100,152300,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
index 6ad044e0..c6f581ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
@@ -1,4 +1,4 @@
-'3277',2101,60800,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74600,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,90800,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,72800,,'',0
+'3466',2101,74600,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,60800,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3470',1002101,72800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
index 590ad0b4..182039c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
@@ -1,3 +1,3 @@
-'3277',2101,61000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,90900,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
+'3466',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
index ebdcd52d..c85a193d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
@@ -1,4 +1,4 @@
-'3277',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,91100,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,74000,,'',0
+'3466',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3470',1002101,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
index ebdcd52d..c85a193d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
@@ -1,4 +1,4 @@
-'3277',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,91100,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,74000,,'',0
+'3466',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3470',1002101,74000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
index d1b38a53..2260dafc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
@@ -1,4 +1,4 @@
-'3277',2101,61300,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,75000,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,91200,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,74100,,'',0
+'3466',2101,75000,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61300,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3470',1002101,74100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
index 16e05908..dc425398 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
@@ -1,4 +1,4 @@
-'3277',2101,61400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,75100,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,91300,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,74200,,'',0
+'3466',2101,75100,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3470',1002101,74200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
index d6eea75e..1aaac41e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
@@ -1,4 +1,4 @@
-'3277',2101,61600,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16800,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9500,,'',0,11900,,'',0,11100,,'',0
-'3281',2101,75300,,'',0,20000,,'',0,15700,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,91500,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,74400,,'',0
+'3466',2101,75300,,'',0,20000,,'',0,15700,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,61600,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16800,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9500,,'',0,11900,,'',0,11100,,'',0
+'3470',1002101,74400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
index 4944f20d..87690cf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
@@ -1,4 +1,4 @@
-'3277',2101,61800,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16700,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9600,,'',0,11800,,'',0,11100,,'',0
-'3281',2101,75500,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3282',2101,91700,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002101,74600,,'',0
+'3466',2101,75500,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3470',2101,61800,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16700,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9600,,'',0,11800,,'',0,11100,,'',0
+'3470',1002101,74600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
index c4e0bf05..66a14760 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
@@ -1,4 +1,4 @@
-'3277',2101,61900,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3281',2101,75600,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3282',2101,91800,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002101,74700,,'',0
+'3466',2101,75600,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3470',2101,61900,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3470',1002101,74700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
index c9c1c4f3..931730ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
@@ -1,4 +1,4 @@
-'3277',2101,62000,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3281',2101,75700,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3282',2101,91900,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002101,74800,,'',0
+'3466',2101,75700,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3470',2101,62000,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3470',1002101,74800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
index 0ee33428..3202aa48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
@@ -1,4 +1,4 @@
-'3277',2101,62100,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3281',2101,75800,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3282',2101,92000,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002101,74900,,'',0
+'3466',2101,75800,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3470',2101,62100,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3470',1002101,74900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
index 9f1e552a..4382d29b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
@@ -1,4 +1,4 @@
-'3277',2100,63700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81300,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150000,,'',0,5500,,'',0
+'3466',2100,81300,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,63700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150000,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
index 1b92d857..c8345b3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
@@ -1,4 +1,4 @@
-'3277',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81400,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5600,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150100,,'',0,5500,,'',0
+'3466',2100,81400,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5600,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150100,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
index 3092ec40..9aa18610 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
@@ -1,4 +1,4 @@
-'3277',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81400,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150100,,'',0,5500,,'',0
+'3466',2100,81400,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150100,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
index 4598efb1..b0d6ba64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
@@ -1,4 +1,4 @@
-'3277',2100,63900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81500,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93700,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150200,,'',0,5500,,'',0
+'3466',2100,81500,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,63900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150200,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
index 39fa0ccf..e1abfd3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
@@ -1,4 +1,4 @@
-'3277',2100,64000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81500,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93800,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150300,,'',0,5500,,'',0
+'3466',2100,81500,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,64000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150300,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
index bbc48abc..5e7efd77 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
@@ -1,4 +1,4 @@
-'3277',2100,64100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,81600,,'',0,20100,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16200,,'',0,10900,,'',0
'3282',2100,93800,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,150400,,'',0,5500,,'',0
+'3466',2100,81600,,'',0,20100,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16200,,'',0,10900,,'',0
+'3470',2100,64100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,150400,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
index 3f621f15..3564aecd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
@@ -1,4 +1,4 @@
-'3277',2100,64300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,81800,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12300,,'',0,10900,,'',0
'3282',2100,94100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3277',1002100,150700,,'',0,9500,,'',0
+'3466',2100,81800,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12300,,'',0,10900,,'',0
+'3470',2100,64300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,150700,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
index 2f10829d..ce69beb4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
@@ -1,4 +1,4 @@
-'3277',2100,64500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,81900,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3282',2100,94200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,150900,,'',0,9500,,'',0
+'3466',2100,81900,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,150900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
index 7b8d5273..0501a12d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
@@ -1,4 +1,4 @@
-'3277',2100,64600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82000,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3282',2100,94300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,151000,,'',0,9500,,'',0
+'3466',2100,82000,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,151000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
index 69f34e9a..bd5f6f9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
@@ -1,4 +1,4 @@
-'3277',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3282',2100,94400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,151100,,'',0,9500,,'',0
+'3466',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,151100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
index 69f34e9a..bd5f6f9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
@@ -1,4 +1,4 @@
-'3277',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3282',2100,94400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3277',1002100,151100,,'',0,9500,,'',0
+'3466',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3470',1002100,151100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
index 1b363f8d..40b15750 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
@@ -1,3 +1,3 @@
-'3277',2100,64800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3281',2100,82200,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3282',2100,94500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
+'3466',2100,82200,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3470',2100,64800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107451 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107451
index bfd77c88..8237c40a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107451
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107451
@@ -1,2 +1,2 @@
-'3277',1002100,151300,,'',0,9500,,'',0
-'3277',1002101,73200,,'',0
+'3470',1002100,151300,,'',0,9500,,'',0
+'3470',1002101,73200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107452 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107452
index 60f781c5..fd581432 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107452
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107452
@@ -1,2 +1,2 @@
-'3277',1002100,151500,,'',0,9500,,'',0
-'3277',1002101,73400,,'',0
+'3470',1002100,151500,,'',0,9500,,'',0
+'3470',1002101,73400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107453 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107453
index 579f905e..4948a10c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107453
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107453
@@ -1,2 +1,2 @@
-'3277',1002100,151500,,'',0,9500,,'',0
-'3277',1002101,73500,,'',0
+'3470',1002100,151500,,'',0,9500,,'',0
+'3470',1002101,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107454 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107454
index 6dea517d..138834b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107454
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107454
@@ -1,2 +1,2 @@
-'3277',1002100,151700,,'',0,9500,,'',0
-'3277',1002101,73700,,'',0
+'3470',1002100,151700,,'',0,9500,,'',0
+'3470',1002101,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107455 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107455
index ff712b72..46edfe33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107455
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107455
@@ -1 +1 @@
-'3277',1002100,151900,,'',0,9500,,'',0
+'3470',1002100,151900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107456 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107456
index ff712b72..46edfe33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107456
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107456
@@ -1 +1 @@
-'3277',1002100,151900,,'',0,9500,,'',0
+'3470',1002100,151900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107457 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107457
index ecb25191..e164b7bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107457
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107457
@@ -1 +1 @@
-'3277',1002101,73000,,'',0
+'3470',1002101,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107458 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107458
index 4d2d0665..c6de9c6f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107458
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107458
@@ -1 +1 @@
-'3277',1002101,73100,,'',0
+'3470',1002101,73100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
index f8bb247e..6ce9cb03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
@@ -1,6 +1,6 @@
-'3277',400,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3277',2600,144100,0,'Montrose Exch Only',0
-'3278',2600,80000,,'',0
+'3466',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
'3283',2600,80000,,'',0
+'3470',2600,144100,0,'Montrose Exch Only',0
+'3476',2600,80000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
index 6ef20051..efde1b5d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
@@ -1,3 +1,3 @@
-'3277',400,61400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70400,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3466',400,61900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
index 18a892e3..d60c34bb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
@@ -1,9 +1,9 @@
-'3277',3100,72700,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90800,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3282',3100,112200,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,64200,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3281',1003100,83100,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90800,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72700,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
'3282',1003100,83100,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62900,,'',0,3000,,'',0
-'3278',24003100,60000,,'',0
+'3466',1003100,83100,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,64200,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
'3283',24003100,60000,,'',0
+'3470',24003100,62900,,'',0,3000,,'',0
+'3476',24003100,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
index 40105921..c0d670ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
@@ -1,9 +1,9 @@
-'3277',3100,72800,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3800,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3500,,'',0
-'3281',3100,90900,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3282',3100,112300,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,64400,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3281',1003100,83300,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3466',3100,90900,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72800,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3800,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3500,,'',0
'3282',1003100,83300,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10400,,'',0
-'3277',24003100,63000,,'',0,7000,,'',0
-'3278',24003100,60100,,'',0
+'3466',1003100,83300,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3470',1003100,64400,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
'3283',24003100,60100,,'',0
+'3470',24003100,63000,,'',0,7000,,'',0
+'3476',24003100,60100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
index 978b773e..b2de1fed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
@@ -1,5 +1,5 @@
-'3277',1003101,73100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,70100,,'',0
-'3281',1003101,83700,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3282',1003101,91000,,'',0,21400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,70100,,'',0
+'3466',1003101,83700,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,73100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,70100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
index e687a52d..03c75226 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
@@ -1,5 +1,5 @@
-'3277',1003101,73200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,70200,,'',0
-'3281',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3282',1003101,91100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,70200,,'',0
+'3466',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,73200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,70200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
index daaaf0c5..4aeac91d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
@@ -1,5 +1,5 @@
-'3277',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10600,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,70300,,'',0
-'3281',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3282',1003101,91100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,70300,,'',0
+'3466',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10600,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,70300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
index 856199bb..6eef3b38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
@@ -1,3 +1,3 @@
-'3277',1003100,65000,,'',0,6900,,'',0,3200,,'',0,7400,,'',0,8800,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3281',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3282',1003100,83900,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10400,,'',0
+'3466',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3470',1003100,65000,,'',0,6900,,'',0,3200,,'',0,7400,,'',0,8800,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
index f7b7a2b5..da813032 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
@@ -1,3 +1,3 @@
-'3277',1003100,65000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3281',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3282',1003100,83900,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,12000,,'',0,10400,,'',0
+'3466',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3470',1003100,65000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
index c985eaf6..544b0813 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
@@ -1,3 +1,3 @@
-'3277',1003100,65100,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3281',1003100,84000,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3282',1003100,84000,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,12000,,'',0,10400,,'',0
+'3466',1003100,84000,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3470',1003100,65100,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
index c6bddbd4..91c8e0ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
@@ -1,3 +1,3 @@
-'3277',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62500,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3466',701,72600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
index 2e42b053..dd1289d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
@@ -1,4 +1,4 @@
-'3277',2101,60900,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3281',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3282',2101,90900,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3277',1002101,72900,,'',0
+'3466',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3470',2101,60900,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3470',1002101,72900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
index fe7a5dc1..da796821 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
@@ -1,25 +1,25 @@
-'3277',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3281',101,62100,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,62400,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3281',400,63600,4,'',0,9000,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,11000,4,'',0,14900,4,'',0,9800,4,'',0,10400,4,'',0,9900,4,'',0
+'3466',101,62100,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
'3282',400,72100,4,'',0,20200,4,'',0,13000,4,'',0,17200,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,12800,4,'',0
-'3277',500,62100,4,'',0,9300,4,'',0,10900,4,'',0,2900,4,'',0,6900,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,7500,4,'',0,3600,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7900,4,'',0,3500,4,'',0,7500,4,'',0,3700,4,'',0,7600,4,'',0,3200,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,7400,4,'',0,2900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
-'3278',500,74700,4,'',0
-'3281',500,71100,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7600,4,'',0,2900,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0,9400,4,'',0
+'3466',400,63600,4,'',0,9000,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,11000,4,'',0,14900,4,'',0,9800,4,'',0,10400,4,'',0,9900,4,'',0
'3282',500,65000,4,'',0,10200,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0,10200,4,'',0,9200,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9100,4,'',0,4900,4,'',0,9900,4,'',0
'3283',500,74700,4,'',0
-'3281',701,74100,4,'',0,18600,4,'',0,21500,4,'',0,20700,4,'',0,25500,4,'',0,20800,4,'',0,20000,4,'',0,9800,4,'',0,13000,4,'',0
+'3466',500,71100,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7600,4,'',0,2900,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0,9400,4,'',0
+'3470',500,62100,4,'',0,9300,4,'',0,10900,4,'',0,2900,4,'',0,6900,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,7500,4,'',0,3600,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7900,4,'',0,3500,4,'',0,7500,4,'',0,3700,4,'',0,7600,4,'',0,3200,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,7400,4,'',0,2900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
+'3476',500,74700,4,'',0
'3282',701,64000,4,'',0,20200,4,'',0,19000,4,'',0,20100,4,'',0,20100,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'3281',901,71800,4,'',0,9500,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,9900,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'3466',701,74100,4,'',0,18600,4,'',0,21500,4,'',0,20700,4,'',0,25500,4,'',0,20800,4,'',0,20000,4,'',0,9800,4,'',0,13000,4,'',0
'3282',901,70800,4,'',0,13000,4,'',0,17200,4,'',0,13100,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,13000,4,'',0,16000,4,'',0,12900,4,'',0
-'3277',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
-'3277',2101,55800,,'',0,7200,,'',0,20000,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
-'3281',2101,73600,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3466',901,71800,4,'',0,9500,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,9900,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'3470',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
'3282',2101,85800,,'',0,17000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3277',2400,150400,4,'',0
-'3277',2401,81500,4,'',0
-'3278',2600,82500,4,'',0
+'3466',2101,73600,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3470',2101,55800,,'',0,7200,,'',0,20000,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
+'3470',2400,150400,4,'',0
+'3470',2401,81500,4,'',0
'3283',2600,82500,4,'',0
-'3281',1000701,64100,4,'',0,19800,4,'',0,20500,4,'',0,20100,4,'',0,21200,4,'',0,25400,4,'',0,20300,4,'',0
+'3476',2600,82500,4,'',0
'3282',1000701,74200,4,'',0,19700,4,'',0,19500,4,'',0,20200,4,'',0,20100,4,'',0,19900,4,'',0
-'3277',1002101,71700,,'',0
+'3466',1000701,64100,4,'',0,19800,4,'',0,20500,4,'',0,20100,4,'',0,21200,4,'',0,25400,4,'',0,20300,4,'',0
+'3470',1002101,71700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
index 7deb6c0b..60a5d269 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
@@ -1,13 +1,13 @@
-'3277',201,53100,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,1000,4,'',0,5000,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,62100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',201,63600,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3277',301,55900,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3278',301,72100,,'',0
-'3281',301,64900,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3466',201,62100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,53100,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,1000,4,'',0,5000,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',301,62900,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3283',301,72100,,'',0
-'3277',601,55500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3281',601,60400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3466',301,64900,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3470',301,55900,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3476',301,72100,,'',0
'3282',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3277',2400,142000,0,'Ctr Loop',0
-'3277',2401,73500,0,'Ctr Loop',0
+'3466',601,60400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3470',601,55500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3470',2400,142000,0,'Ctr Loop',0
+'3470',2401,73500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
index 467c803c..11a80409 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
@@ -1,13 +1,13 @@
-'3277',1701,62600,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3277',2201,144500,,'',0
-'3278',2201,80000,,'',0
+'3470',1701,62600,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3283',2201,83000,,'',0
-'3277',3100,72100,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3281',3100,90200,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',2201,144500,,'',0
+'3476',2201,80000,,'',0
'3282',3100,111600,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3277',1003100,63600,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,4900,,'',0,14100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3281',1003100,82500,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3466',3100,90200,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3470',3100,72100,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
'3282',1003100,82500,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3277',24003100,62300,,'',0,3000,,'',0
-'3278',24003100,55400,,'',0
+'3466',1003100,82500,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3470',1003100,63600,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,4900,,'',0,14100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
'3283',24003100,55400,,'',0
+'3470',24003100,62300,,'',0,3000,,'',0
+'3476',24003100,55400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
index 3440ce18..228e2b92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
@@ -1,8 +1,8 @@
-'3277',2100,63400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3277',2101,62200,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3281',2100,81000,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9500,,'',0,16300,,'',0,10900,,'',0
-'3281',2101,75900,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
'3282',2100,93200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12900,,'',0
'3282',2101,92100,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002100,145700,,'',0,9500,,'',0
-'3277',1002101,75000,,'',0
+'3466',2100,81000,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9500,,'',0,16300,,'',0,10900,,'',0
+'3466',2101,75900,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
+'3470',2100,63400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',2101,62200,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3470',1002100,145700,,'',0,9500,,'',0
+'3470',1002101,75000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
index 19302e3d..c26d8358 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
@@ -1,4 +1,4 @@
-'3277',2101,62400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16900,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9400,,'',0,11800,,'',0,11100,,'',0
-'3281',2101,80100,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,15900,,'',0,11300,,'',0
'3282',2101,92300,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,16900,,'',0
-'3277',1002101,75200,,'',0
+'3466',2101,80100,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,15900,,'',0,11300,,'',0
+'3470',2101,62400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16900,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9400,,'',0,11800,,'',0,11100,,'',0
+'3470',1002101,75200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
index 9007f9b0..7098de72 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
@@ -1,4 +1,4 @@
-'3277',2101,62500,,'',0,3200,,'',0,24300,,'',0,11500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11000,,'',0
-'3281',2101,80300,,'',0,20000,,'',0,11800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
'3282',2101,92500,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3277',1002101,75400,,'',0
+'3466',2101,80300,,'',0,20000,,'',0,11800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
+'3470',2101,62500,,'',0,3200,,'',0,24300,,'',0,11500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11000,,'',0
+'3470',1002101,75400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
index 9bb5ebf4..089387d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
@@ -1,8 +1,8 @@
-'3277',2100,63200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3277',2101,62700,4,'',0,3200,4,'',0,24300,4,'',0,11500,4,'',0,11000,4,'',0,12300,4,'',0,16900,4,'',0,2900,4,'',0,9700,4,'',0,8000,4,'',0,9400,4,'',0,11800,4,'',0,11000,4,'',0
-'3281',2100,80800,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
-'3281',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19000,4,'',0,12500,4,'',0,11200,4,'',0,9600,4,'',0,15900,4,'',0,11300,4,'',0
'3282',2100,93000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12900,,'',0,16900,,'',0
'3282',2101,92700,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12900,4,'',0,16900,4,'',0
-'3277',1002100,145500,,'',0,9500,,'',0
-'3277',1002101,75600,4,'',0
+'3466',2100,80800,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3466',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19000,4,'',0,12500,4,'',0,11200,4,'',0,9600,4,'',0,15900,4,'',0,11300,4,'',0
+'3470',2100,63200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',2101,62700,4,'',0,3200,4,'',0,24300,4,'',0,11500,4,'',0,11000,4,'',0,12300,4,'',0,16900,4,'',0,2900,4,'',0,9700,4,'',0,8000,4,'',0,9400,4,'',0,11800,4,'',0,11000,4,'',0
+'3470',1002100,145500,,'',0,9500,,'',0
+'3470',1002101,75600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
index ba83bc43..adc5b16d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
@@ -1,4 +1,4 @@
-'3277',2100,63300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3281',2100,80900,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
'3282',2100,93100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12900,,'',0
-'3277',1002100,145600,,'',0,9500,,'',0
+'3466',2100,80900,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3470',2100,63300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3470',1002100,145600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
index 5ad7b235..62a2905f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
@@ -1,19 +1,19 @@
-'3277',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
-'3281',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3282',3101,100300,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62100,,'',0
-'3281',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3466',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3470',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
'3282',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3283',3201,62100,,'',0
-'3277',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
-'3281',3500,84300,,'',0,67200,,'',0,22000,,'',0
+'3466',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62100,,'',0
'3282',3500,100000,,'',0,21500,,'',0,63400,,'',0
-'3277',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
+'3466',3500,84300,,'',0,67200,,'',0,22000,,'',0
+'3470',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
'3282',3900,93300,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
-'3277',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3278',1003101,65100,,'',0
-'3281',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3466',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
'3282',1003101,85900,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65100,,'',0
+'3466',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3470',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3476',1003101,65100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
index 272e34d0..fad74fcc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
@@ -1,13 +1,13 @@
-'3277',3101,62100,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
-'3281',3101,75600,,'',0,10300,,'',0,14500,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3282',3101,100400,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62100,,'',0
-'3281',3201,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3466',3101,75600,,'',0,10300,,'',0,14500,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3470',3101,62100,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
'3282',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3283',3201,62100,,'',0
-'3277',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3278',1003101,65100,,'',0
-'3281',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3466',3201,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62100,,'',0
'3282',1003101,85900,,'',0,25300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65100,,'',0
+'3466',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3470',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3476',1003101,65100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
index 4afe4b14..10e0ce91 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
@@ -1,14 +1,14 @@
-'3277',3100,73900,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7500,,'',0
-'3277',3101,62700,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11700,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2700,,'',0,7200,,'',0,1700,,'',0,38400,,'',0
-'3281',3100,91900,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
-'3281',3101,80200,,'',0,10300,,'',0,10500,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3282',3100,113400,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
'3282',3101,101000,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3277',1003100,65600,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9300,,'',0,7300,,'',0,4100,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,14800,,'',0
-'3277',1003101,72700,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11600,,'',0,9400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,2400,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,65700,,'',0
-'3281',1003100,84500,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,5800,,'',0
-'3281',1003101,83200,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3466',3100,91900,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
+'3466',3101,80200,,'',0,10300,,'',0,10500,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
+'3470',3100,73900,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7500,,'',0
+'3470',3101,62700,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11700,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2700,,'',0,7200,,'',0,1700,,'',0,38400,,'',0
'3282',1003100,84500,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,16000,,'',0,10400,,'',0
'3282',1003101,90500,,'',0,21400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,65700,,'',0
+'3466',1003100,84500,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,5800,,'',0
+'3466',1003101,83200,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003100,65600,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9300,,'',0,7300,,'',0,4100,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,14800,,'',0
+'3470',1003101,72700,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11600,,'',0,9400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,2400,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,65700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
index 8d7579bb..03e52936 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
@@ -1,17 +1,17 @@
-'3277',3100,74200,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,7600,,'',0,2700,,'',0,800,,'',0,7500,,'',0
-'3281',3100,92200,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3282',3100,113700,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
-'3277',3200,61000,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,7500,,'',0,3800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
-'3278',3200,64100,,'',0
-'3281',3200,81500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,8500,,'',0,2900,,'',0,7000,,'',0,13000,,'',0
+'3466',3100,92200,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
+'3470',3100,74200,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,7600,,'',0,2700,,'',0,800,,'',0,7500,,'',0
'3282',3200,81600,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3283',3200,64100,,'',0
-'3277',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81400,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,9900,,'',0
+'3466',3200,81500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,8500,,'',0,2900,,'',0,7000,,'',0,13000,,'',0
+'3470',3200,61000,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,7500,,'',0,3800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
+'3476',3200,64100,,'',0
'3282',3300,84400,,'',0,10700,,'',0,15000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,16000,,'',0,10000,,'',0
-'3277',1003100,65900,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9400,,'',0,7300,,'',0,4000,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10300,,'',0,14800,,'',0
-'3281',1003100,84800,,'',0,10400,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,9800,,'',0
+'3466',3300,81400,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,9900,,'',0
+'3470',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
'3282',1003100,84800,,'',0,10500,,'',0,14900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,14300,,'',0,16000,,'',0,10400,,'',0
-'3277',24003100,64200,,'',0,7000,,'',0
-'3278',24003100,61200,,'',0
+'3466',1003100,84800,,'',0,10400,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,9800,,'',0
+'3470',1003100,65900,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9400,,'',0,7300,,'',0,4000,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10300,,'',0,14800,,'',0
'3283',24003100,61200,,'',0
+'3470',24003100,64200,,'',0,7000,,'',0
+'3476',24003100,61200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
index b912ec4a..7a62a560 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
@@ -1,14 +1,14 @@
-'3277',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
-'3281',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3282',3101,100200,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62000,,'',0
-'3281',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3466',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3470',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
'3282',3201,75500,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3283',3201,62000,,'',0
-'3281',3501,82500,,'',0,63100,,'',0,26000,,'',0
-'3277',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3278',1003101,65000,,'',0
-'3281',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3466',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62000,,'',0
+'3466',3501,82500,,'',0,63100,,'',0,26000,,'',0
'3282',1003101,85800,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65000,,'',0
+'3466',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3470',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3476',1003101,65000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
index dcd573eb..e69d0d08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
@@ -1,5 +1,5 @@
-'3277',3201,55400,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62500,,'',0
-'3281',3201,75900,,'',0,7100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,75900,,'',0,14300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62500,,'',0
+'3466',3201,75900,,'',0,7100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55400,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
index b8cb6d80..47c59bcf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
@@ -1,8 +1,8 @@
-'3277',3201,55500,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62600,,'',0
-'3281',3201,80000,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62600,,'',0
-'3277',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80000,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55500,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62600,,'',0
'3282',3900,91300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
index 9ce63116..67d6c171 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
@@ -1,8 +1,8 @@
-'3277',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62700,,'',0
-'3281',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62700,,'',0
-'3277',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62700,,'',0
'3282',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
index 1edb4c63..f414bfe3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
@@ -1,8 +1,8 @@
-'3277',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62700,,'',0
-'3281',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62700,,'',0
-'3277',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62700,,'',0
'3282',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
index 4fd6c5fd..48608b2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
@@ -1,8 +1,8 @@
-'3277',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62800,,'',0
-'3281',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62800,,'',0
-'3277',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62800,,'',0
'3282',3900,91500,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
index 1a3b9cda..92052530 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
@@ -1,8 +1,8 @@
-'3277',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62800,,'',0
-'3281',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62800,,'',0
-'3277',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62800,,'',0
'3282',3900,91600,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
index de9a4f7b..bd29db07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
@@ -1,8 +1,8 @@
-'3277',3201,55800,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62900,,'',0
-'3281',3201,80300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80300,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62900,,'',0
-'3277',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55800,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62900,,'',0
'3282',3900,91700,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
index 45b59c5a..10eb742d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
@@ -1,8 +1,8 @@
-'3277',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63000,,'',0
-'3281',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63000,,'',0
-'3277',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63000,,'',0
'3282',3900,91700,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
index 6551128e..fb3ec5d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
@@ -1,5 +1,5 @@
-'3277',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63000,,'',0
-'3281',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63000,,'',0
+'3466',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
index 6551128e..fb3ec5d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
@@ -1,5 +1,5 @@
-'3277',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63000,,'',0
-'3281',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63000,,'',0
+'3466',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
index 43394a60..a4c4d919 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
@@ -1,5 +1,5 @@
-'3277',3201,60000,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63100,,'',0
-'3281',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80500,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63100,,'',0
+'3466',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,60000,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
index 2b7ac05b..767d01fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
@@ -1,5 +1,5 @@
-'3277',3201,60000,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63100,,'',0
-'3281',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80600,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63100,,'',0
+'3466',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,60000,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
index 98d1973d..1fc7e94d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
@@ -1,5 +1,5 @@
-'3277',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63200,,'',0
-'3281',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80700,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63200,,'',0
+'3466',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
index 98d1973d..1fc7e94d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
@@ -1,5 +1,5 @@
-'3277',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,63200,,'',0
-'3281',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80700,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,63200,,'',0
+'3466',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,63200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
index 08bcd07e..08fac458 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
@@ -1,10 +1,10 @@
-'3277',3200,60200,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3277',3201,60200,4,'',0,10100,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3700,4,'',0,7800,4,'',0,3500,4,'',0,7800,4,'',0,7200,4,'',0,3500,4,'',0,7400,4,'',0,4400,4,'',0,6700,4,'',0,9500,4,'',0,10500,4,'',0
-'3278',3200,63300,,'',0
-'3278',3201,63300,4,'',0
-'3281',3200,80700,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
-'3281',3201,80700,4,'',0,3100,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,4500,4,'',0,6900,4,'',0,3000,4,'',0,17000,4,'',0
'3282',3200,80800,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3282',3201,80800,4,'',0,10300,4,'',0,10300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7900,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,15000,4,'',0,11500,4,'',0
'3283',3200,63300,,'',0
'3283',3201,63300,4,'',0
+'3466',3200,80700,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3466',3201,80700,4,'',0,3100,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,4500,4,'',0,6900,4,'',0,3000,4,'',0,17000,4,'',0
+'3470',3200,60200,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3470',3201,60200,4,'',0,10100,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3700,4,'',0,7800,4,'',0,3500,4,'',0,7800,4,'',0,7200,4,'',0,3500,4,'',0,7400,4,'',0,4400,4,'',0,6700,4,'',0,9500,4,'',0,10500,4,'',0
+'3476',3200,63300,,'',0
+'3476',3201,63300,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
index 245f21d3..253adee7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
@@ -1,5 +1,5 @@
-'3277',3200,60300,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63400,,'',0
-'3281',3200,80800,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,80900,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63400,,'',0
+'3466',3200,80800,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60300,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
index 59b6cd82..4f7b0789 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
@@ -1,5 +1,5 @@
-'3277',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63500,,'',0
-'3281',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63500,,'',0
+'3466',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
index 1d01cb44..39606db3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
@@ -1,5 +1,5 @@
-'3277',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63500,,'',0
-'3281',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63500,,'',0
+'3466',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
index c6407410..b48e8339 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
@@ -1,5 +1,5 @@
-'3277',3200,60500,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63600,,'',0
-'3281',3200,81000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81100,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63600,,'',0
+'3466',3200,81000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60500,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
index 217e116a..3752a8e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
@@ -1,5 +1,5 @@
-'3277',3200,60600,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10400,,'',0
-'3278',3200,63700,,'',0
-'3281',3200,81100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63700,,'',0
+'3466',3200,81100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60600,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10400,,'',0
+'3476',3200,63700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
index 2c09aed0..0a2a3824 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
@@ -1,5 +1,5 @@
-'3277',3200,60600,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63700,,'',0
-'3281',3200,81100,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81200,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63700,,'',0
+'3466',3200,81100,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60600,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
index 5b5c3bc6..7e7cfd36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
@@ -1,3 +1,3 @@
-'3277',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,91300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
index b131bfc7..fd44b9ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
@@ -1,3 +1,3 @@
-'3277',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3282',3900,90100,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,14000,,'',0
+'3466',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3470',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
index 7c344937..2bad96d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
@@ -1,3 +1,3 @@
-'3277',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82700,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
index f323776c..86ebf3ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
@@ -1,6 +1,6 @@
-'3277',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82800,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3400,60900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3281',3400,81400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3466',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
'3282',3400,84100,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
index 7bab00df..3b379e42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
@@ -1,6 +1,6 @@
-'3277',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82900,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
'3282',3900,92500,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
index 7bab00df..3b379e42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
@@ -1,6 +1,6 @@
-'3277',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82900,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
'3282',3900,92500,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
index cd7e057f..50fa70f9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
@@ -1,3 +1,3 @@
-'3277',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83000,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
index f6d2b988..2b324152 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
@@ -1,3 +1,3 @@
-'3277',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,83100,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
index 91356612..a6f2e807 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
@@ -1,3 +1,3 @@
-'3277',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83100,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
index 7027e7c2..9ac11808 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
@@ -1,3 +1,3 @@
-'3277',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80200,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83200,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80200,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
index cf7c9479..f634633d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
@@ -1,6 +1,6 @@
-'3277',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83300,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
-'3277',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3466',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
'3282',3401,83000,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3466',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
index 7aebb28d..36de784a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
@@ -1,3 +1,3 @@
-'3277',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,83300,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
index 6503dc5f..197fc04a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
@@ -1,3 +1,3 @@
-'3277',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83400,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
index c970f470..d5a05857 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
@@ -1,3 +1,3 @@
-'3277',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83400,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
index 2bdc8fdd..be17b498 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
@@ -1,3 +1,3 @@
-'3277',3301,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,80500,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3301,83500,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3301,80500,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3301,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
index df520ea0..eee26e35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
@@ -1,3 +1,3 @@
-'3277',3300,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,80700,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3282',3300,83700,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,80700,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3470',3300,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
index 03109b60..ad9682de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
@@ -1,3 +1,3 @@
-'3277',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,80700,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3282',3300,83700,,'',0,10700,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,80700,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
+'3470',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
index 303a4b6e..e846763f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
@@ -1,3 +1,3 @@
-'3277',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,80800,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3282',3300,83800,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,80800,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
+'3470',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
index cd28010c..a77224fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
@@ -1,3 +1,3 @@
-'3277',3300,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,80900,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3282',3300,83900,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,80900,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
+'3470',3300,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
index 7bd19c25..eba8e0dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
@@ -1,3 +1,3 @@
-'3277',3300,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,80900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3282',3300,83900,,'',0,10700,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,80900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
+'3470',3300,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
index cf837d57..7af2a5d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
@@ -1,3 +1,3 @@
-'3277',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3282',3300,84000,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,81000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
+'3470',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
index 811002ea..7990a67f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
@@ -1,3 +1,3 @@
-'3277',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3282',3300,84100,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,81100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
+'3470',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
index 4718d022..7c0a82c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
@@ -1,3 +1,3 @@
-'3277',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3282',3300,84100,,'',0,10700,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,81100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
+'3470',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
index 47600358..4839df78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
@@ -1,3 +1,3 @@
-'3277',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3282',3900,92800,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
index ce075c9c..a464c31d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
@@ -1,3 +1,3 @@
-'3277',3401,55100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82400,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
index 94eaea87..c190537e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
@@ -1,3 +1,3 @@
-'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
index 10da986e..2f9208d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
@@ -1,3 +1,3 @@
-'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
index 1fa8c01d..96645cbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
@@ -1,3 +1,3 @@
-'3277',3401,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9800,,'',0,10000,,'',0
-'3281',3401,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3282',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3470',3401,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9800,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
index b8aab66f..5cd232e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
@@ -1,3 +1,3 @@
-'3277',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
index c2fee75b..973b55d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
@@ -1,3 +1,3 @@
-'3277',3401,55400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75900,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,82700,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75900,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
index 8cf0ce48..5c0a5d95 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
@@ -1,3 +1,3 @@
-'3277',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,82800,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3466',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
index 2287081c..53ff7794 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
@@ -1,3 +1,3 @@
-'3277',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,82800,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
index 53e5856e..310310ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
@@ -1,3 +1,3 @@
-'3277',3401,55600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,80100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,82900,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3466',3401,80100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
index 48fd2274..907fe480 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
@@ -1,3 +1,3 @@
-'3277',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,83000,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
index 6eca12ac..a2abc91c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
@@ -1,3 +1,3 @@
-'3277',3401,55800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3401,80300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,83100,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3401,80300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
index 66888a69..7d513d9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
@@ -1,3 +1,3 @@
-'3277',3401,55900,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3401,80400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,83200,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3401,80400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,55900,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
index 4de764a0..8115fbab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
@@ -1,3 +1,3 @@
-'3277',3401,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3401,83300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3466',3401,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3401,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
index d42ce29e..aea94aad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
@@ -1,3 +1,3 @@
-'3277',3400,60100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,80600,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3400,83400,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,80600,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3400,60100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
index 881a3d1a..2ed33b55 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
@@ -1,3 +1,3 @@
-'3277',3400,60200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,80700,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3282',3400,83500,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,80700,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3470',3400,60200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
index eb618f24..1537a888 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
@@ -1,3 +1,3 @@
-'3277',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83600,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
index 4c659ee3..0344ae17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
@@ -1,3 +1,3 @@
-'3277',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83700,,'',0,17700,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
index 3fd01a58..90ce16aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
@@ -1,3 +1,3 @@
-'3277',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83700,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
index 0cd725d2..209ea2ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
@@ -1,3 +1,3 @@
-'3277',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83700,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
index 0fe9f602..c95ec2a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
@@ -1,3 +1,3 @@
-'3277',3400,60600,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,81100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83800,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60600,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
index 09b6fd41..836ff624 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
@@ -1,3 +1,3 @@
-'3277',3400,60700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3281',3400,81200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83900,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
index b96cbad6..9e9cffb6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
@@ -1,3 +1,3 @@
-'3277',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3281',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83900,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
index 16e2b112..15795504 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
@@ -1,3 +1,3 @@
-'3277',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3281',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,84000,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
index 54b44451..8cc69c30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
@@ -1,3 +1,3 @@
-'3277',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3281',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,84000,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
index 14ca9c16..18c69bfa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
@@ -1,3 +1,3 @@
-'3277',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
-'3281',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,84200,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
index e8b7d27d..261e5602 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
@@ -1,3 +1,3 @@
-'3277',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,92300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
index 89a37430..a8fbf665 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
@@ -1,3 +1,3 @@
-'3277',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,91800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
index f135c2f0..06a0a617 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
@@ -1,3 +1,3 @@
-'3277',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,91900,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
index b29cfc31..77ca58c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
@@ -1,6 +1,6 @@
-'3277',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3277',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
-'3281',3500,83000,,'',0,67200,,'',0,22000,,'',0
-'3281',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
'3282',3500,94700,,'',0,25500,,'',0,63400,,'',0
'3282',3501,94700,4,'',0,25500,4,'',0,63400,4,'',0
+'3466',3500,83000,,'',0,67200,,'',0,22000,,'',0
+'3466',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
+'3470',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3470',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
index bcc52c38..7880ab8a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
@@ -1,3 +1,3 @@
-'3277',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3281',3500,83400,,'',0,67200,,'',0,22000,,'',0
'3282',3500,95100,,'',0,25500,,'',0,63400,,'',0
+'3466',3500,83400,,'',0,67200,,'',0,22000,,'',0
+'3470',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
index fc0c40e3..4db1567f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
@@ -1,3 +1,3 @@
-'3277',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3281',3500,83600,,'',0,67200,,'',0,22000,,'',0
'3282',3500,95300,,'',0,25500,,'',0,63400,,'',0
+'3466',3500,83600,,'',0,67200,,'',0,22000,,'',0
+'3470',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
index 178d0747..0173cc0c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
@@ -1,3 +1,3 @@
-'3277',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3282',3900,93000,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
index 2491d5ac..6d63aa91 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
@@ -1,8 +1,8 @@
-'3277',3200,60700,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,63800,,'',0
-'3281',3200,81200,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81300,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63800,,'',0
-'3277',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3466',3200,81200,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60700,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10500,,'',0
+'3476',3200,63800,,'',0
'3282',3900,90800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
index 8d645388..e4d015df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
@@ -1,8 +1,8 @@
-'3277',3200,60800,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
-'3278',3200,63900,,'',0
-'3281',3200,81300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8500,,'',0,2900,,'',0,3000,,'',0,17000,,'',0
'3282',3200,81400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3283',3200,63900,,'',0
-'3277',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3466',3200,81300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8500,,'',0,2900,,'',0,3000,,'',0,17000,,'',0
+'3470',3200,60800,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
+'3476',3200,63900,,'',0
'3282',3900,90800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
index 83c99089..ca2d74d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
@@ -1,3 +1,3 @@
-'3277',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3282',3900,92900,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3470',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
index 9ce63116..67d6c171 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
@@ -1,8 +1,8 @@
-'3277',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62700,,'',0
-'3281',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3283',3201,62700,,'',0
-'3277',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3466',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62700,,'',0
'3282',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
index 711d8e33..b67e81a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
@@ -1,6 +1,6 @@
-'3277',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82800,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
-'3281',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3466',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
'3282',3400,84100,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
index 96ee67e4..a640f988 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
@@ -1,3 +1,3 @@
-'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
index 60e97936..1e39696a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
@@ -1,28 +1,28 @@
-'3277',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,62300,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3281',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',300,55100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,62100,,'',0
-'3281',300,55400,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
'3282',300,63500,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3283',300,62100,,'',0
-'3281',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3466',300,55400,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,55100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,62100,,'',0
'3282',401,64500,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3277',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60200,,'',0
-'3281',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3466',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3282',501,61700,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60200,,'',0
-'3281',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3470',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60200,,'',0
'3282',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3281',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',900,63000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',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
-'3277',2601,141500,,'',0
-'3278',2601,72500,,'',0
+'3466',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',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
'3283',2601,72500,,'',0
-'3281',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',2601,141500,,'',0
+'3476',2601,72500,,'',0
'3282',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
index 1671b5b9..09b06c90 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
@@ -1,12 +1,12 @@
-'3277',100,51900,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3277',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,3100,4,'',0,5800,4,'',0,2100,4,'',0,1900,4,'',0,5800,4,'',0,1700,4,'',0,1800,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6200,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1300,4,'',0,700,4,'',0,2600,4,'',0,6300,4,'',0,1800,4,'',0,2000,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,3000,4,'',0,6500,4,'',0,2600,4,'',0,7200,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,2500,4,'',0
-'3281',100,60600,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
-'3281',101,63400,4,'',0,8100,4,'',0,8500,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3500,4,'',0,6300,4,'',0,3300,4,'',0,7600,4,'',0,2400,4,'',0,6300,4,'',0,3500,4,'',0,6900,4,'',0,4900,4,'',0
'3282',100,60800,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,15900,,'',0
'3282',101,63600,4,'',0,8100,4,'',0,4200,4,'',0,8600,4,'',0,8600,4,'',0,8800,4,'',0,3500,4,'',0,10100,4,'',0,9300,4,'',0,9000,4,'',0,9000,4,'',0,8900,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9700,4,'',0,6600,4,'',0,9300,4,'',0
-'3277',200,53600,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3277',201,55400,4,'',0,7000,4,'',0,3100,4,'',0,6700,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,1800,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1800,4,'',0,1900,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,2600,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,2900,4,'',0
-'3281',200,60000,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
-'3281',201,64300,4,'',0,7500,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3500,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7200,4,'',0,7600,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,7300,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,6800,4,'',0,3000,4,'',0,7500,4,'',0,2900,4,'',0,6400,4,'',0,3400,4,'',0,7000,4,'',0,4900,4,'',0
+'3466',100,60600,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3466',101,63400,4,'',0,8100,4,'',0,8500,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3500,4,'',0,6300,4,'',0,3300,4,'',0,7600,4,'',0,2400,4,'',0,6300,4,'',0,3500,4,'',0,6900,4,'',0,4900,4,'',0
+'3470',100,51900,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3470',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,3100,4,'',0,5800,4,'',0,2100,4,'',0,1900,4,'',0,5800,4,'',0,1700,4,'',0,1800,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6200,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1300,4,'',0,700,4,'',0,2600,4,'',0,6300,4,'',0,1800,4,'',0,2000,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,3000,4,'',0,6500,4,'',0,2600,4,'',0,7200,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,2500,4,'',0
'3282',200,61700,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
'3282',201,65800,4,'',0,8000,4,'',0,8600,4,'',0,8600,4,'',0,4500,4,'',0,8600,4,'',0,9300,4,'',0,8700,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9600,4,'',0,8700,4,'',0,9500,4,'',0,8200,4,'',0,8900,4,'',0,4400,4,'',0,8500,4,'',0
+'3466',200,60000,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3466',201,64300,4,'',0,7500,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3500,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7200,4,'',0,7600,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,7300,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,6800,4,'',0,3000,4,'',0,7500,4,'',0,2900,4,'',0,6400,4,'',0,3400,4,'',0,7000,4,'',0,4900,4,'',0
+'3470',200,53600,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3470',201,55400,4,'',0,7000,4,'',0,3100,4,'',0,6700,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,1800,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1800,4,'',0,1900,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,2600,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,2900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
index 7ab5733e..6a67c3ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
@@ -1,5 +1,5 @@
-'3277',1501,62100,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
-'3281',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3277',2600,145000,0,'Montrose Exch Only',0
-'3278',2600,80700,,'',0
+'3466',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62100,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
'3283',2600,80700,,'',0
+'3470',2600,145000,0,'Montrose Exch Only',0
+'3476',2600,80700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
index 39a33b04..c2ed6c70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
@@ -1,16 +1,16 @@
-'3277',3101,62400,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
-'3281',3101,75900,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3282',3101,100600,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3278',3201,62400,,'',0
-'3281',3201,75800,,'',0,7100,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3466',3101,75900,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
+'3470',3101,62400,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
'3282',3201,75800,,'',0,14300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3283',3201,62400,,'',0
-'3277',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3466',3201,75800,,'',0,7100,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3470',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3476',3201,62400,,'',0
'3282',3900,90200,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,14000,,'',0
-'3277',1003101,72300,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,65300,,'',0
-'3281',1003101,82800,,'',0,10600,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,9900,,'',0
+'3466',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3470',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
'3282',1003101,90100,,'',0,21300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65300,,'',0
+'3466',1003101,82800,,'',0,10600,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,9900,,'',0
+'3470',1003101,72300,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,65300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120011
index ded86d8b..82d08592 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120011
@@ -1 +1 @@
-'3277',1601,80400,,'',0,12100,,'',0,68200,,'',0,4800,,'',0
+'3470',1601,80400,,'',0,12100,,'',0,68200,,'',0,4800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120012
index 8202d854..4874675c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120012
@@ -1,3 +1,3 @@
-'3277',2201,150800,,'',0
-'3278',2201,81700,,'',0
'3283',2201,84700,,'',0
+'3470',2201,150800,,'',0
+'3476',2201,81700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
index 0243805d..4d066dba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
@@ -1,6 +1,6 @@
-'3277',3100,73400,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7600,,'',0
-'3281',3100,91400,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3282',3100,112900,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
-'3277',24003100,63500,,'',0,7000,,'',0
-'3278',24003100,60600,,'',0
+'3466',3100,91400,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
+'3470',3100,73400,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7600,,'',0
'3283',24003100,60600,,'',0
+'3470',24003100,63500,,'',0,7000,,'',0
+'3476',24003100,60600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
index e7de1077..7fe74236 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
@@ -1,8 +1,8 @@
-'3277',3101,63300,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,2700,,'',0,7100,,'',0,1700,,'',0,38400,,'',0
-'3281',3101,80700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3282',3101,101600,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3277',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3278',1003101,70300,,'',0
-'3281',1003101,83900,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3466',3101,80700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3470',3101,63300,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,2700,,'',0,7100,,'',0,1700,,'',0,38400,,'',0
'3282',1003101,91200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3283',1003101,70300,,'',0
+'3466',1003101,83900,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3470',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3476',1003101,70300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
index 5d82bbd1..44fadd2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
@@ -1,5 +1,5 @@
-'3277',1500,64200,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
-'3281',1500,92700,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3277',2601,143200,,'',0
-'3278',2601,75100,,'',0
+'3466',1500,92700,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,64200,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
'3283',2601,75100,,'',0
+'3470',2601,143200,,'',0
+'3476',2601,75100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120017
index 5dc07c19..4c08159f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120017
@@ -1 +1 @@
-'3277',2600,145300,0,'Montrose Exch Only',0
+'3470',2600,145300,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120018
index 40fb7c3b..0d48f409 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120018
@@ -1 +1 @@
-'3277',2400,142300,0,'Ctr Loop',0
+'3470',2400,142300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
index a78b773d..c569581d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
@@ -1,6 +1,6 @@
-'3277',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3282',701,63100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000701,63200,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3466',701,73200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',1000701,73300,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63200,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
index 0ab6ef3b..a9f293ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
@@ -1,11 +1,11 @@
-'3277',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3281',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,63000,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3277',301,60600,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72900,,'',0
-'3281',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3466',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
'3282',301,63600,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72900,,'',0
-'3277',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3281',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3466',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60600,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72900,,'',0
'3282',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
+'3466',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3470',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
index 2a098f1a..76cfec4b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
@@ -1,4 +1,4 @@
-'3277',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,60800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',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
+'3466',101,60800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3470',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/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
index 297de3a7..9e6bfbbd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
@@ -1,2 +1,2 @@
-'3277',1501,62600,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3281',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62600,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
index 882d7373..b2eca6a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
@@ -1,2 +1,2 @@
-'3277',1501,62500,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3466',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1501,62500,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
index b1eda442..2dbce7bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
@@ -1,2 +1,2 @@
-'3277',1500,63700,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3281',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3466',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3470',1500,63700,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
index 78552453..37069154 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
@@ -1,3 +1,3 @@
-'3277',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
'3282',3900,85000,,'',0,15500,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'3466',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
+'3470',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120032
index e69a7181..aa78971a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120032
@@ -1 +1 @@
-'3277',2401,81000,0,'Ctr Loop',0
+'3470',2401,81000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
index 238cc0a8..7817dfa7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
@@ -1,3 +1,3 @@
-'3277',201,54900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
'3282',201,65400,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,54900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
index 28ca6f0e..a1b18977 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
@@ -1,3 +1,3 @@
-'3277',201,55000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,64000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
'3282',201,65500,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,64000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,55000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
index 41ebea6e..af5ec4ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
@@ -1,3 +1,3 @@
-'3277',201,55200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,64100,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,4900,,'',0
'3282',201,65600,,'',0,8000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'3466',201,64100,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,4900,,'',0
+'3470',201,55200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
index c77ec805..61716efb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
@@ -1,3 +1,3 @@
-'3277',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64900,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
index 2441fb79..18a2c537 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
@@ -1,3 +1,3 @@
-'3277',200,54300,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62400,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54300,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
index fa01fda6..c7ad01f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
@@ -1,3 +1,3 @@
-'3277',200,54300,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62400,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54300,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
index ee83390d..f8a81ca8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
@@ -1,3 +1,3 @@
-'3277',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62500,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
index 36150bd0..4f8c7722 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
@@ -1,3 +1,3 @@
-'3277',201,54100,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63100,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3282',201,64600,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63100,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3470',201,54100,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
index 7f9bff4d..8e357e1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
@@ -1,3 +1,3 @@
-'3277',200,54200,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62300,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54200,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
index 545135ee..2f2ea9cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
@@ -1,6 +1,6 @@
-'3277',200,60900,4,'',0,2100,4,'',0,7100,4,'',0,3400,4,'',0,7000,4,'',0,2100,4,'',0,2000,4,'',0,5800,4,'',0,1800,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,5800,4,'',0,2500,4,'',0,2300,4,'',0,6700,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,3100,4,'',0,7100,4,'',0,2400,4,'',0,5800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6500,4,'',0,3200,4,'',0,6800,4,'',0,2800,4,'',0
-'3277',201,51500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',200,63200,4,'',0,8500,4,'',0,3500,4,'',0,6900,4,'',0,3200,4,'',0,7100,4,'',0,2700,4,'',0,7600,4,'',0,3200,4,'',0,7200,4,'',0,7300,4,'',0,3400,4,'',0,7200,4,'',0,3600,4,'',0,7600,4,'',0,3100,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7400,4,'',0,2700,4,'',0,6900,4,'',0,3600,4,'',0,6600,4,'',0,2400,4,'',0,7300,4,'',0,2900,4,'',0
-'3281',201,60500,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',200,64900,4,'',0,8300,4,'',0,8100,4,'',0,8800,4,'',0,4700,4,'',0,8700,4,'',0,8700,4,'',0,9400,4,'',0,8900,4,'',0,5300,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,8400,4,'',0,9500,4,'',0,4000,4,'',0,8800,4,'',0,9000,4,'',0
'3282',201,62000,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3466',200,63200,4,'',0,8500,4,'',0,3500,4,'',0,6900,4,'',0,3200,4,'',0,7100,4,'',0,2700,4,'',0,7600,4,'',0,3200,4,'',0,7200,4,'',0,7300,4,'',0,3400,4,'',0,7200,4,'',0,3600,4,'',0,7600,4,'',0,3100,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7400,4,'',0,2700,4,'',0,6900,4,'',0,3600,4,'',0,6600,4,'',0,2400,4,'',0,7300,4,'',0,2900,4,'',0
+'3466',201,60500,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',200,60900,4,'',0,2100,4,'',0,7100,4,'',0,3400,4,'',0,7000,4,'',0,2100,4,'',0,2000,4,'',0,5800,4,'',0,1800,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,5800,4,'',0,2500,4,'',0,2300,4,'',0,6700,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,3100,4,'',0,7100,4,'',0,2400,4,'',0,5800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6500,4,'',0,3200,4,'',0,6800,4,'',0,2800,4,'',0
+'3470',201,51500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
index 36e6c1d8..37375ebe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
@@ -1,3 +1,3 @@
-'3277',201,54600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,63600,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3282',201,65100,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3466',201,63600,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,54600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
index eb832c91..033e2514 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
@@ -1,3 +1,3 @@
-'3277',200,54200,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3281',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62300,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3466',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54200,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
index ca42db76..2b2b7c5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
@@ -1,6 +1,6 @@
-'3277',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,1300,,'',0,700,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,3000,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,63400,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3282',101,63600,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,9400,,'',0
-'3277',201,55300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3281',201,64300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
+'3466',101,63400,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
+'3470',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,1300,,'',0,700,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,3000,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
'3282',201,65800,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'3466',201,64300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
+'3470',201,55300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
index d337f89e..f971cd67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
@@ -1,3 +1,3 @@
-'3277',100,52500,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3281',100,61300,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3282',100,61400,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3466',100,61300,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3470',100,52500,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
index 2e43ec5c..5fe9d824 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
@@ -1,3 +1,3 @@
-'3277',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3281',101,63100,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0,4900,,'',0
'3282',101,63300,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8800,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,5300,,'',0
+'3466',101,63100,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0,4900,,'',0
+'3470',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
index e707d27a..a1793d1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
@@ -1,6 +1,6 @@
-'3277',200,54100,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3281',200,60500,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3282',200,62200,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
-'3277',2201,150700,,'',0
-'3278',2201,81700,,'',0
+'3466',200,60500,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3470',200,54100,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
'3283',2201,84700,,'',0
+'3470',2201,150700,,'',0
+'3476',2201,81700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
index 1c23462a..4d723926 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
@@ -1,6 +1,6 @@
-'3277',3300,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3277',3301,60100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7100,4,'',0,3200,4,'',0,7000,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,8300,4,'',0,7300,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,4400,4,'',0,6700,4,'',0,3000,4,'',0,6500,4,'',0
-'3281',3300,80600,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
-'3281',3301,80600,4,'',0,3000,4,'',0,7300,4,'',0,3200,4,'',0,7100,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11900,4,'',0,10000,4,'',0
'3282',3300,83600,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
'3282',3301,83600,4,'',0,10600,4,'',0,11000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,10900,4,'',0,12000,4,'',0,10000,4,'',0
+'3466',3300,80600,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3466',3301,80600,4,'',0,3000,4,'',0,7300,4,'',0,3200,4,'',0,7100,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11900,4,'',0,10000,4,'',0
+'3470',3300,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3470',3301,60100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7100,4,'',0,3200,4,'',0,7000,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,8300,4,'',0,7300,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,4400,4,'',0,6700,4,'',0,3000,4,'',0,6500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
index b8aab66f..5cd232e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
@@ -1,3 +1,3 @@
-'3277',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3466',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
+'3470',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
index b5ebfcf4..1c32448d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
@@ -1,3 +1,3 @@
-'3277',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,91200,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
index 11bf428a..456a0330 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
@@ -1,3 +1,3 @@
-'3277',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,92600,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
index 11b3b07c..65bad26e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
@@ -1,3 +1,3 @@
-'3277',3400,60300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3281',3400,80800,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83500,,'',0,17800,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3466',3400,80800,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3470',3400,60300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
index e189a245..22837b1b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
@@ -1,3 +1,3 @@
-'3277',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3281',3501,82900,,'',0,67200,,'',0,22000,,'',0
'3282',3501,94600,,'',0,25500,,'',0,63400,,'',0
+'3466',3501,82900,,'',0,67200,,'',0,22000,,'',0
+'3470',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
index 0b41fee1..d34821b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
@@ -1,6 +1,6 @@
-'3277',1000700,75000,4,'',0,6500,4,'',0,13000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,7000,4,'',0,12900,4,'',0,19900,4,'',0,19800,4,'',0
-'3277',1000701,75000,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3281',1000700,61900,4,'',0,19700,4,'',0,20500,4,'',0,20100,4,'',0,21000,4,'',0,21500,4,'',0,20400,4,'',0
-'3281',1000701,61900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
'3282',1000700,72000,4,'',0,19600,4,'',0,19500,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0
'3282',1000701,72000,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61900,4,'',0,19700,4,'',0,20500,4,'',0,20100,4,'',0,21000,4,'',0,21500,4,'',0,20400,4,'',0
+'3466',1000701,61900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,75000,4,'',0,6500,4,'',0,13000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,7000,4,'',0,12900,4,'',0,19900,4,'',0,19800,4,'',0
+'3470',1000701,75000,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
index 5e7ac75e..4012c8b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
@@ -1,3 +1,3 @@
-'3277',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
'3282',3900,85400,,'',0,15600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15400,,'',0,14000,,'',0
+'3466',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
+'3470',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
index 3ab594ef..044690af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
@@ -1,3 +1,3 @@
-'3277',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
-'3281',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3282',3900,90600,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,18000,,'',0
+'3466',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3470',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
index dd58ed07..160cf8ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
@@ -1,5 +1,5 @@
-'3277',500,61400,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3278',500,73800,,'',0
-'3281',500,70400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3282',500,64300,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3283',500,73800,,'',0
+'3466',500,70400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3470',500,61400,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3476',500,73800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
index a13b5fb8..7137f48b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
@@ -1,5 +1,5 @@
-'3277',501,63600,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3278',501,60800,,'',0
-'3281',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3282',501,62200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3283',501,60800,,'',0
+'3466',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3470',501,63600,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3476',501,60800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
index 7783269f..5f12063c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
@@ -1,6 +1,6 @@
-'3277',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3281',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3282',700,61100,,'',0,20000,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3277',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3281',1000700,61100,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3466',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
'3282',1000700,71100,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,61100,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3470',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
index b4b41058..79a1d878 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
@@ -1,6 +1,6 @@
-'3277',400,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3277',401,61100,4,'',0,10100,4,'',0,2500,4,'',0,6600,4,'',0,11400,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,2500,4,'',0,7500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,12400,4,'',0
-'3281',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
-'3281',401,61600,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,10500,4,'',0,9900,4,'',0
'3282',400,70100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
'3282',401,70100,4,'',0,20100,4,'',0,13000,4,'',0,17100,4,'',0,13000,4,'',0,17100,4,'',0,13000,4,'',0,11900,4,'',0,17000,4,'',0
+'3466',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3466',401,61600,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,10500,4,'',0,9900,4,'',0
+'3470',400,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3470',401,61100,4,'',0,10100,4,'',0,2500,4,'',0,6600,4,'',0,11400,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,2500,4,'',0,7500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,12400,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
index 782f9e7b..62b85388 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
@@ -1,33 +1,33 @@
-'3277',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3281',101,61500,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3282',101,61900,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3277',200,60300,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3281',200,62600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3466',101,61500,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
'3282',200,64300,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3277',301,55200,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8600,4,'',0
-'3278',301,71400,,'',0
-'3281',301,64200,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8200,4,'',0
+'3466',200,62600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3470',200,60300,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
'3282',301,62200,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9200,4,'',0
'3283',301,71400,,'',0
-'3277',400,62800,4,'',0,10200,4,'',0,2500,4,'',0,6600,4,'',0,11500,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,6500,4,'',0,3500,4,'',0,10100,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,12300,4,'',0
-'3277',401,60000,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3281',401,60400,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3466',301,64200,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8200,4,'',0
+'3470',301,55200,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8600,4,'',0
+'3476',301,71400,,'',0
'3282',401,64900,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3277',700,62000,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3277',701,65000,4,'',0,25100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,15800,4,'',0,26800,4,'',0
-'3281',700,70600,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3466',401,60400,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3470',400,62800,4,'',0,10200,4,'',0,2500,4,'',0,6600,4,'',0,11500,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,6500,4,'',0,3500,4,'',0,10100,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,12300,4,'',0
+'3470',401,60000,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
'3282',700,60600,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3277',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3277',901,61400,4,'',0,10200,4,'',0,10300,4,'',0,9800,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10700,4,'',0
-'3281',900,64500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3466',700,70600,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3470',700,62000,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3470',701,65000,4,'',0,25100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,15800,4,'',0,26800,4,'',0
'3282',900,63500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3277',1500,73500,4,'',0,12300,4,'',0,68100,4,'',0
-'3277',1600,73500,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3277',1601,161100,4,'',0
-'3277',2601,142100,,'',0
-'3278',2601,73000,,'',0
+'3466',900,64500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3470',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
+'3470',901,61400,4,'',0,10200,4,'',0,10300,4,'',0,9800,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10700,4,'',0
+'3470',1500,73500,4,'',0,12300,4,'',0,68100,4,'',0
+'3470',1600,73500,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
+'3470',1601,161100,4,'',0
'3283',2601,73000,,'',0
-'3277',1000700,73500,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3277',1000701,80900,4,'',0,2400,4,'',0,17000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,3000,4,'',0,16900,4,'',0,19800,4,'',0,19800,4,'',0
-'3281',1000700,60600,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',2601,142100,,'',0
+'3476',2601,73000,,'',0
'3282',1000700,70600,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3466',1000700,60600,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3470',1000700,73500,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
+'3470',1000701,80900,4,'',0,2400,4,'',0,17000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,3000,4,'',0,16900,4,'',0,19800,4,'',0,19800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
index de0ce9f5..e3bc325f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
@@ -1,29 +1,29 @@
-'3277',100,54400,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,6200,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3281',100,63200,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3282',100,63100,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3277',201,52600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3281',201,61600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3466',100,63200,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3470',100,54400,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,6200,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
'3282',201,63100,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3277',300,60200,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3278',300,63300,,'',0
-'3281',300,60500,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3466',201,61600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3470',201,52600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'3282',300,64500,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3283',300,63300,,'',0
-'3281',400,63200,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,5900,,'',0,14400,,'',0,9900,,'',0
+'3466',300,60500,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3470',300,60200,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3476',300,63300,,'',0
'3282',400,71700,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3277',701,64900,0,'Montrose Exch',0,25100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3281',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3466',400,63200,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,5900,,'',0,14400,,'',0,9900,,'',0
'3282',701,63400,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3281',901,71300,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3470',701,64900,0,'Montrose Exch',0,25100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
'3282',901,70300,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3277',1500,65100,4,'',0,109500,4,'',0,8600,4,'',0
-'3277',1501,61500,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3281',1500,93500,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
-'3281',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3277',1601,80700,4,'',0,12100,4,'',0,73100,4,'',0
-'3277',2600,151100,4,'',0
-'3278',2600,81800,,'',0
+'3466',901,71300,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3466',1500,93500,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3466',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3470',1500,65100,4,'',0,109500,4,'',0,8600,4,'',0
+'3470',1501,61500,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3470',1601,80700,4,'',0,12100,4,'',0,73100,4,'',0
'3283',2600,81800,,'',0
-'3277',1000701,80800,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
-'3281',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',2600,151100,4,'',0
+'3476',2600,81800,,'',0
'3282',1000701,73600,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3466',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3470',1000701,80800,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
index b2a7f6dd..f2d3305b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
@@ -1,6 +1,6 @@
-'3277',400,61300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3281',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3282',400,70300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3277',2600,144200,0,'Montrose Exch Only',0
-'3278',2600,80100,,'',0
+'3466',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3470',400,61300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
'3283',2600,80100,,'',0
+'3470',2600,144200,0,'Montrose Exch Only',0
+'3476',2600,80100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
index e5913861..07886037 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
@@ -1,5 +1,5 @@
-'3277',301,54700,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3278',301,70800,,'',0
-'3281',301,63700,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
'3282',301,61700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,14100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3283',301,70800,,'',0
+'3466',301,63700,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3470',301,54700,,'',0,9100,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3476',301,70800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
index 23837e13..7a4acb02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
@@ -1,3 +1,3 @@
-'3277',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81300,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,5900,,'',0
'3282',3300,84300,,'',0,10700,,'',0,15000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3466',3300,81300,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,5900,,'',0
+'3470',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
index 5c300e5e..2fec07d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
@@ -1,5 +1,5 @@
-'3277',301,60400,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3278',301,72700,,'',0
-'3281',301,65500,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3282',301,63400,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3283',301,72700,,'',0
+'3466',301,65500,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3470',301,60400,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3476',301,72700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
index 78b073f4..7bf5ee86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
@@ -1,6 +1,6 @@
-'3277',3400,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3277',3401,60000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7000,4,'',0,3200,4,'',0,7100,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,7600,4,'',0,7900,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,4500,4,'',0,9700,4,'',0,9900,4,'',0
-'3281',3400,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
-'3281',3401,80500,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,15000,4,'',0,11400,4,'',0
'3282',3400,83300,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
'3282',3401,83300,4,'',0,17700,4,'',0,11100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
+'3466',3400,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3466',3401,80500,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,15000,4,'',0,11400,4,'',0
+'3470',3400,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3470',3401,60000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7000,4,'',0,3200,4,'',0,7100,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,7600,4,'',0,7900,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,4500,4,'',0,9700,4,'',0,9900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
index 00009de1..19778370 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
@@ -1,3 +1,3 @@
-'3277',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,92000,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
index 803f92e2..cf4e52fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
@@ -1,3 +1,3 @@
-'3277',701,64200,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3281',701,72700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3282',701,62600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3466',701,72700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3470',701,64200,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
index 11bf428a..456a0330 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
@@ -1,3 +1,3 @@
-'3277',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3282',3900,92600,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3466',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3470',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092
index a95bc442..abb642d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092
@@ -1,26 +1,26 @@
-'3277',3100,74400,4,'',0,7100,4,'',0,3500,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,9900,4,'',0,7800,4,'',0,1700,4,'',0,7600,4,'',0,2700,4,'',0,800,4,'',0,7500,4,'',0
-'3281',3100,92400,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,11000,4,'',0
'3282',3100,113900,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,10300,4,'',0
-'3277',3200,61200,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,2700,4,'',0,9500,4,'',0,10400,4,'',0
-'3278',3200,64300,4,'',0
-'3281',3200,81700,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
+'3466',3100,92400,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,11000,4,'',0
+'3470',3100,74400,4,'',0,7100,4,'',0,3500,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,9900,4,'',0,7800,4,'',0,1700,4,'',0,7600,4,'',0,2700,4,'',0,800,4,'',0,7500,4,'',0
'3282',3200,81800,4,'',0,10400,4,'',0,10300,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,11000,4,'',0,11500,4,'',0
'3283',3200,64300,4,'',0
-'3277',3300,61200,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,6900,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7600,4,'',0,4300,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,2700,4,'',0,7000,4,'',0,2500,4,'',0
-'3277',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,81600,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,15900,4,'',0,9900,4,'',0
-'3281',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3466',3200,81700,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
+'3470',3200,61200,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,2700,4,'',0,9500,4,'',0,10400,4,'',0
+'3476',3200,64300,4,'',0
'3282',3300,84600,4,'',0,10700,4,'',0,15000,4,'',0,3600,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,10800,4,'',0,16000,4,'',0,10000,4,'',0
'3282',3301,82500,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3400,61200,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
-'3277',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
-'3281',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
-'3281',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3466',3300,81600,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,15900,4,'',0,9900,4,'',0
+'3466',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3470',3300,61200,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,6900,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7600,4,'',0,4300,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,2700,4,'',0,7000,4,'',0,2500,4,'',0
+'3470',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
'3282',3400,84300,4,'',0,17800,4,'',0,11100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
'3282',3401,82300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
-'3277',1003100,70100,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,8700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,3900,4,'',0,9400,4,'',0,7300,4,'',0,8000,4,'',0,4900,4,'',0,8100,4,'',0,12700,4,'',0,14300,4,'',0,10800,4,'',0
-'3281',1003100,85000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0,15600,4,'',0,10100,4,'',0,9800,4,'',0
+'3466',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
+'3466',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3470',3400,61200,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
+'3470',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
'3282',1003100,85000,4,'',0,10500,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,14800,4,'',0,14300,4,'',0,16000,4,'',0,10400,4,'',0
-'3277',24003100,64300,4,'',0,7000,4,'',0
-'3278',24003100,61300,4,'',0
+'3466',1003100,85000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0,15600,4,'',0,10100,4,'',0,9800,4,'',0
+'3470',1003100,70100,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,8700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,3900,4,'',0,9400,4,'',0,7300,4,'',0,8000,4,'',0,4900,4,'',0,8100,4,'',0,12700,4,'',0,14300,4,'',0,10800,4,'',0
'3283',24003100,61300,4,'',0
+'3470',24003100,64300,4,'',0,7000,4,'',0
+'3476',24003100,61300,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093
index 2673ea59..1f28ad5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093
@@ -1,8 +1,8 @@
-'3277',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
-'3277',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3281',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
'3282',3500,100000,4,'',0,21500,4,'',0,63400,4,'',0
'3282',3501,94100,,'',0,21500,,'',0,67500,,'',0
-'3277',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
-'3281',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
+'3466',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'3470',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
+'3470',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
'3282',3900,84600,,'',0,8800,4,'',0,6700,,'',0,4900,4,'',0,5600,,'',0,4900,4,'',0,6600,,'',0,8900,4,'',0,2100,,'',0,8900,4,'',0,2600,,'',0,8900,4,'',0,6600,,'',0,4800,4,'',0,9200,,'',0,8700,4,'',0
+'3466',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
+'3470',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
diff --git a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index 363dbad3..3a3592d1 100644
--- a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
49.1583
-122.47064
-122.21454
- 1725800400
- 1728967020
+ 1727010000
+ 1729404540
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
index f9ed5607..6cc0255d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
@@ -1,137 +1,128 @@
-'3284',20241015,1
-'3285',20241015,1
-'3284',20241016,1
-'3285',20241016,1
-'3284',20241017,1
-'3285',20241017,1
-'3284',20241018,1
-'3285',20241018,1
-'3287',20241019,1
'3288',20241020,1
-'3284',20241021,1
'3289',20241021,1
-'3284',20241022,1
-'3285',20241022,1
-'3284',20241023,1
-'3285',20241023,1
-'3284',20241024,1
-'3285',20241024,1
-'3284',20241025,1
-'3285',20241025,1
-'3287',20241026,1
+'3486',20241021,1
+'3486',20241022,1
+'3487',20241022,1
+'3486',20241023,1
+'3487',20241023,1
+'3486',20241024,1
+'3487',20241024,1
+'3486',20241025,1
+'3487',20241025,1
+'3489',20241026,1
'3288',20241027,1
-'3284',20241028,1
'3289',20241028,1
-'3284',20241029,1
-'3285',20241029,1
-'3284',20241030,1
-'3285',20241030,1
-'3284',20241031,1
-'3285',20241031,1
-'3284',20241101,1
-'3285',20241101,1
-'3287',20241102,1
+'3486',20241028,1
+'3486',20241029,1
+'3487',20241029,1
+'3486',20241030,1
+'3487',20241030,1
+'3486',20241031,1
+'3487',20241031,1
+'3486',20241101,1
+'3487',20241101,1
+'3489',20241102,1
'3288',20241103,1
-'3284',20241104,1
'3289',20241104,1
-'3284',20241105,1
-'3285',20241105,1
-'3284',20241106,1
-'3285',20241106,1
-'3284',20241107,1
-'3285',20241107,1
-'3284',20241108,1
-'3285',20241108,1
-'3287',20241109,1
+'3486',20241104,1
+'3486',20241105,1
+'3487',20241105,1
+'3486',20241106,1
+'3487',20241106,1
+'3486',20241107,1
+'3487',20241107,1
+'3486',20241108,1
+'3487',20241108,1
+'3489',20241109,1
'3288',20241110,1
'3288',20241111,1
-'3284',20241112,1
-'3285',20241112,1
-'3284',20241113,1
-'3285',20241113,1
-'3284',20241114,1
-'3285',20241114,1
-'3284',20241115,1
-'3285',20241115,1
-'3287',20241116,1
+'3486',20241112,1
+'3487',20241112,1
+'3486',20241113,1
+'3487',20241113,1
+'3486',20241114,1
+'3487',20241114,1
+'3486',20241115,1
+'3487',20241115,1
+'3489',20241116,1
'3288',20241117,1
-'3284',20241118,1
'3289',20241118,1
-'3284',20241119,1
-'3285',20241119,1
-'3284',20241120,1
-'3285',20241120,1
-'3284',20241121,1
-'3285',20241121,1
-'3284',20241122,1
-'3285',20241122,1
-'3287',20241123,1
+'3486',20241118,1
+'3486',20241119,1
+'3487',20241119,1
+'3486',20241120,1
+'3487',20241120,1
+'3486',20241121,1
+'3487',20241121,1
+'3486',20241122,1
+'3487',20241122,1
+'3489',20241123,1
'3288',20241124,1
-'3284',20241125,1
'3289',20241125,1
-'3284',20241126,1
-'3285',20241126,1
-'3284',20241127,1
-'3285',20241127,1
-'3284',20241128,1
-'3285',20241128,1
-'3284',20241129,1
-'3285',20241129,1
-'3287',20241130,1
+'3486',20241125,1
+'3486',20241126,1
+'3487',20241126,1
+'3486',20241127,1
+'3487',20241127,1
+'3486',20241128,1
+'3487',20241128,1
+'3486',20241129,1
+'3487',20241129,1
+'3489',20241130,1
'3288',20241201,1
-'3284',20241202,1
'3289',20241202,1
-'3284',20241203,1
-'3285',20241203,1
-'3284',20241204,1
-'3285',20241204,1
-'3284',20241205,1
-'3285',20241205,1
-'3284',20241206,1
-'3285',20241206,1
-'3287',20241207,1
+'3486',20241202,1
+'3486',20241203,1
+'3487',20241203,1
+'3486',20241204,1
+'3487',20241204,1
+'3486',20241205,1
+'3487',20241205,1
+'3486',20241206,1
+'3487',20241206,1
+'3489',20241207,1
'3288',20241208,1
-'3284',20241209,1
'3289',20241209,1
-'3284',20241210,1
-'3285',20241210,1
-'3284',20241211,1
-'3285',20241211,1
-'3284',20241212,1
-'3285',20241212,1
-'3284',20241213,1
-'3285',20241213,1
-'3287',20241214,1
+'3486',20241209,1
+'3486',20241210,1
+'3487',20241210,1
+'3486',20241211,1
+'3487',20241211,1
+'3486',20241212,1
+'3487',20241212,1
+'3486',20241213,1
+'3487',20241213,1
+'3489',20241214,1
'3288',20241215,1
-'3284',20241216,1
'3289',20241216,1
-'3284',20241217,1
-'3285',20241217,1
-'3284',20241218,1
-'3285',20241218,1
-'3284',20241219,1
-'3285',20241219,1
-'3284',20241220,1
-'3285',20241220,1
-'3287',20241221,1
+'3486',20241216,1
+'3486',20241217,1
+'3487',20241217,1
+'3486',20241218,1
+'3487',20241218,1
+'3486',20241219,1
+'3487',20241219,1
+'3486',20241220,1
+'3487',20241220,1
+'3489',20241221,1
'3288',20241222,1
-'3284',20241223,1
'3289',20241223,1
-'3284',20241224,1
-'3285',20241224,1
+'3486',20241223,1
+'3486',20241224,1
+'3487',20241224,1
'3288',20241225,1
'3288',20241226,1
-'3284',20241227,1
-'3285',20241227,1
-'3287',20241228,1
+'3486',20241227,1
+'3487',20241227,1
+'3489',20241228,1
'3288',20241229,1
-'3284',20241230,1
'3289',20241230,1
-'3284',20241231,1
-'3285',20241231,1
+'3486',20241230,1
+'3486',20241231,1
+'3487',20241231,1
'3288',20250101,1
-'3284',20250102,1
-'3285',20250102,1
-'3284',20250103,1
-'3285',20250103,1
-'3287',20250104,1
+'3486',20250102,1
+'3487',20250102,1
+'3486',20250103,1
+'3487',20250103,1
+'3489',20250104,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105721 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105721
index 4d18c629..b21e9e06 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105721
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105721
@@ -1,3 +1,3 @@
-'3284',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62100,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105722 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105722
index b3202316..20b282fb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105722
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105722
@@ -1,3 +1,3 @@
-'3284',201,54700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63700,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3288',201,65200,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63700,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105723 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105723
index b05bd114..37e50498 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105723
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105723
@@ -1,3 +1,3 @@
-'3284',2201,150000,,'',0
-'3285',2201,81200,,'',0
'3289',2201,84200,,'',0
+'3486',2201,150000,,'',0
+'3487',2201,81200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105724 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105724
index 472aecad..b5e640d0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105724
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105724
@@ -1,3 +1,3 @@
-'3284',2201,145800,,'',0
-'3285',2201,80900,,'',0
'3289',2201,83900,,'',0
+'3486',2201,145800,,'',0
+'3487',2201,80900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105725 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105725
index d04322bf..f6658f18 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105725
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105725
@@ -1,3 +1,3 @@
-'3284',2201,145500,,'',0
-'3285',2201,80600,,'',0
'3289',2201,83600,,'',0
+'3486',2201,145500,,'',0
+'3487',2201,80600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105726 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105726
index 2dde0897..4b039504 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105726
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105726
@@ -1,6 +1,6 @@
-'3284',2600,144000,0,'Montrose Exch Only',0
-'3284',2601,144000,4,'',0
-'3285',2600,75900,,'',0
-'3285',2601,75900,4,'',0
'3289',2600,75900,,'',0
'3289',2601,75900,4,'',0
+'3486',2600,144000,0,'Montrose Exch Only',0
+'3486',2601,144000,4,'',0
+'3487',2600,75900,,'',0
+'3487',2601,75900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105727 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105727
index 3ba2c9cf..2c0b3eb9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105727
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105727
@@ -1,3 +1,3 @@
-'3284',1501,62200,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3284',2600,145100,0,'Montrose Exch Only',0
+'3486',1501,62200,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',2600,145100,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105729 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105729
index 060690b4..90991a36 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105729
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105729
@@ -1 +1 @@
-'3284',2400,145000,0,'Ctr Loop',0
+'3486',2400,145000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105730 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105730
index 2b4f87f1..92c3938b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105730
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105730
@@ -1,3 +1,3 @@
-'3284',2201,150300,,'',0
-'3285',2201,81400,,'',0
'3289',2201,84400,,'',0
+'3486',2201,150300,,'',0
+'3487',2201,81400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105731 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105731
index e315ae19..b724797d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105731
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105731
@@ -1,6 +1,6 @@
-'3284',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62100,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
-'3284',2201,150600,,'',0
-'3285',2201,81600,,'',0
+'3486',200,54000,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60400,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3289',2201,84600,,'',0
+'3486',2201,150600,,'',0
+'3487',2201,81600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105732 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105732
index be9732b0..69825de5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105732
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105732
@@ -1 +1 @@
-'3284',2401,80800,0,'Ctr Loop',0
+'3486',2401,80800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105733 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105733
index 0a40e604..37fdc127 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105733
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105733
@@ -1,4 +1,4 @@
-'3284',2201,145200,,'',0
-'3285',2201,80400,,'',0
'3289',2201,83400,,'',0
-'3284',2400,143600,0,'Ctr Loop',0
+'3486',2201,145200,,'',0
+'3487',2201,80400,,'',0
+'3486',2400,143600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105734 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105734
index 7702db9f..dfa4ab3b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105734
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105734
@@ -1,4 +1,4 @@
-'3284',2201,152100,,'',0
-'3285',2201,82700,,'',0
'3289',2201,85700,,'',0
-'3284',2401,75700,0,'Ctr Loop',0
+'3486',2201,152100,,'',0
+'3487',2201,82700,,'',0
+'3486',2401,75700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105735 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105735
index 409ebbeb..58371ba4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105735
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105735
@@ -1,4 +1,4 @@
-'3284',2201,152100,,'',0
-'3285',2201,82800,,'',0
'3289',2201,85800,,'',0
-'3284',2401,75800,0,'Ctr Loop',0
+'3486',2201,152100,,'',0
+'3487',2201,82800,,'',0
+'3486',2401,75800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105736 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105736
index 918bea04..ddbee215 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105736
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105736
@@ -1,3 +1,3 @@
-'3284',2201,150900,,'',0
-'3285',2201,81800,,'',0
'3289',2201,84800,,'',0
+'3486',2201,150900,,'',0
+'3487',2201,81800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105737 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105737
index 1df48be6..8709fd83 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105737
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105737
@@ -1 +1 @@
-'3284',2400,144000,0,'Ctr Loop',0
+'3486',2400,144000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105738 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105738
index e65b5ec2..e8d36184 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105738
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105738
@@ -1,4 +1,4 @@
-'3284',2201,145300,,'',0
-'3285',2201,80500,,'',0
'3289',2201,83500,,'',0
-'3284',2400,143800,0,'Ctr Loop',0
+'3486',2201,145300,,'',0
+'3487',2201,80500,,'',0
+'3486',2400,143800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105739 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105739
index e4047d33..55285b65 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105739
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_105739
@@ -1 +1 @@
-'3284',2400,144900,0,'Ctr Loop',0
+'3486',2400,144900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107001 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107001
index 3ef17dd7..2b93b002 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107001
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107001
@@ -1,3 +1,3 @@
-'3284',201,54500,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63500,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3288',201,65000,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54500,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63500,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107005
index 970f3292..9f2d705f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107005
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107005
@@ -1,3 +1,3 @@
-'3284',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62500,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107006
index 054d95d8..7cdb3621 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107006
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107006
@@ -1,3 +1,3 @@
-'3284',200,54600,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,61000,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62700,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54600,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,61000,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107007
index b25a55c8..8890da00 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107007
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107007
@@ -1,3 +1,3 @@
-'3284',200,54700,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62800,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54700,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107008
index 1f295619..3615d5ed 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107008
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107008
@@ -1,3 +1,3 @@
-'3284',200,54700,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62800,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54700,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61100,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107009
index b892c9c8..4fe9d4e5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107009
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107009
@@ -1,3 +1,3 @@
-'3284',200,54800,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62900,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9400,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
+'3486',200,54800,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107010
index c7bb70c5..131c06b9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107010
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107010
@@ -1,3 +1,3 @@
-'3284',200,54800,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62900,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9400,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
+'3486',200,54800,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61200,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107011
index 47033148..78095a23 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107011
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107011
@@ -1,11 +1,11 @@
-'3284',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,63000,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
-'3284',301,60500,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72800,,'',0
-'3287',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3486',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',301,63500,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72800,,'',0
-'3284',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',301,60500,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72800,,'',0
+'3489',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
+'3486',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107012
index 0b940dcb..5799d83c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107012
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107012
@@ -1,12 +1,12 @@
-'3284',100,53000,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',100,61800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61800,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3284',200,55000,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61400,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53000,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',100,61800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,63100,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3284',2100,65500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,10900,,'',0
-'3287',2100,82900,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',200,55000,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61400,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3288',2100,95200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143200,0,'Ctr Loop',0
-'3284',1002100,152800,,'',0,9500,,'',0
+'3486',2100,65500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,10900,,'',0
+'3489',2100,82900,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143200,0,'Ctr Loop',0
+'3486',1002100,152800,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107013
index 1c4b4e1f..3fc54396 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107013
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107013
@@ -1,12 +1,12 @@
-'3284',100,53100,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61900,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3284',200,55100,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61500,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53100,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,63200,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3284',2100,65600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
-'3287',2100,83000,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',200,55100,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61500,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3288',2100,95300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143300,0,'Ctr Loop',0
-'3284',1002100,152900,,'',0,9500,,'',0
+'3486',2100,65600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
+'3489',2100,83000,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143300,0,'Ctr Loop',0
+'3486',1002100,152900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107014
index 64b6c732..cb69e220 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107014
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107014
@@ -1,12 +1,12 @@
-'3284',100,53100,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6800,,'',0
'3288',100,61900,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
-'3284',200,55200,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53100,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',100,61900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6800,,'',0
'3288',200,63300,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8600,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65100,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7600,,'',0
-'3284',2100,65600,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
-'3287',2100,83100,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',200,55200,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65100,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7600,,'',0
'3288',2100,95400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143500,0,'Ctr Loop',0
-'3284',1002100,153000,,'',0,9500,,'',0
+'3486',2100,65600,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10900,,'',0
+'3489',2100,83100,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143500,0,'Ctr Loop',0
+'3486',1002100,153000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107015
index ba5b761c..d3bf5b86 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107015
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107015
@@ -1,14 +1,14 @@
-'3284',100,53200,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'3287',100,62000,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,62000,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4800,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5500,,'',0,15900,,'',0
-'3284',200,55200,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53200,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'3489',100,62000,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,63300,,'',0,8300,,'',0,4100,,'',0,8800,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65200,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
-'3284',2100,65700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
-'3287',2100,83100,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3486',200,55200,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,61600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65200,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
'3288',2100,95400,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3284',2201,152200,,'',0
-'3285',2201,82900,,'',0
+'3486',2100,65700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
+'3489',2100,83100,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
'3289',2201,85900,,'',0
-'3284',1002100,153100,,'',0,9500,,'',0
+'3486',2201,152200,,'',0
+'3487',2201,82900,,'',0
+'3486',1002100,153100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107016
index c667167e..ef26b470 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107016
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107016
@@ -1,14 +1,14 @@
-'3284',100,53300,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'3287',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6900,,'',0
'3288',100,62100,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,8600,,'',0,4800,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',200,55300,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,61700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53300,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
+'3489',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6900,,'',0
'3288',200,63400,,'',0,8300,,'',0,4100,,'',0,8800,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65300,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
-'3284',2100,65800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
-'3287',2100,83200,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
+'3486',200,55300,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,61700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,2900,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65300,,'',0,7200,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8400,,'',0,3800,,'',0,7500,,'',0
'3288',2100,95500,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3284',2201,152300,,'',0
-'3285',2201,82900,,'',0
+'3486',2100,65800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15600,,'',0,10800,,'',0
+'3489',2100,83200,,'',0,20300,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12100,,'',0,10900,,'',0
'3289',2201,85900,,'',0
-'3284',1002100,153200,,'',0,9500,,'',0
+'3486',2201,152300,,'',0
+'3487',2201,82900,,'',0
+'3486',1002100,153200,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107017
index c19facd0..8f685459 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107017
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107017
@@ -1,14 +1,14 @@
-'3284',100,53300,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6800,,'',0
'3288',100,62100,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9600,,'',0,11900,,'',0
-'3284',200,55400,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,53300,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,3500,,'',0,6800,,'',0
'3288',200,63500,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8000,,'',0,8800,,'',0,9000,,'',0
-'3284',1700,65300,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
-'3284',2100,65800,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
-'3287',2100,83300,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3486',200,55400,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,3000,,'',0,7700,,'',0,6600,,'',0,2400,,'',0,3300,,'',0,7000,,'',0
+'3486',1700,65300,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
'3288',2100,95600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2201,152400,,'',0
-'3285',2201,83000,,'',0
+'3486',2100,65800,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
+'3489',2100,83300,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
'3289',2201,90000,,'',0
-'3284',1002100,153300,,'',0,9500,,'',0
+'3486',2201,152400,,'',0
+'3487',2201,83000,,'',0
+'3486',1002100,153300,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107018
index e2e46fba..1db1fdc0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107018
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107018
@@ -1,17 +1,17 @@
-'3284',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62200,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9600,,'',0,11900,,'',0
-'3284',200,55500,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,7000,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',200,63600,,'',0,8300,,'',0,8100,,'',0,4700,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,5500,,'',0,8000,,'',0,8800,,'',0,9000,,'',0
-'3284',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3287',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3486',200,55500,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2700,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,7000,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
-'3284',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
-'3287',2100,83400,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
+'3486',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
+'3489',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3486',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7600,,'',0
'3288',2100,95700,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2201,152500,,'',0
-'3285',2201,83100,,'',0
+'3486',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16700,,'',0,13400,,'',0,24600,,'',0,4800,,'',0,15500,,'',0,10900,,'',0
+'3489',2100,83400,,'',0,20200,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12200,,'',0,10900,,'',0
'3289',2201,90100,,'',0
-'3284',1002100,153400,,'',0,9500,,'',0
+'3486',2201,152500,,'',0
+'3487',2201,83100,,'',0
+'3486',1002100,153400,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107019 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107019
index 24104c5e..afcbeefc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107019
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107019
@@ -1,17 +1,17 @@
-'3284',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62200,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',200,55500,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',100,53400,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62200,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,7100,,'',0,3100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',200,63600,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8600,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3287',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3486',200,55500,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,61900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',1700,65400,,'',0,7300,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7500,,'',0
-'3284',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16700,,'',0,17400,,'',0,20600,,'',0,4800,,'',0,15500,,'',0,10800,,'',0
-'3287',2100,83400,,'',0,20300,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12100,,'',0,10900,,'',0
+'3486',601,62100,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
+'3489',601,62900,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
+'3486',1700,65400,,'',0,7300,,'',0,8900,,'',0,72600,,'',0,7800,,'',0,8500,,'',0,3700,,'',0,7500,,'',0
'3288',2100,95700,,'',0,17100,,'',0,13100,,'',0,17000,,'',0,12900,,'',0,16800,,'',0,12800,,'',0
-'3284',2201,152600,,'',0
-'3285',2201,83100,,'',0
+'3486',2100,65900,,'',0,7300,,'',0,9600,,'',0,10500,,'',0,11600,,'',0,11000,,'',0,16700,,'',0,17400,,'',0,20600,,'',0,4800,,'',0,15500,,'',0,10800,,'',0
+'3489',2100,83400,,'',0,20300,,'',0,11900,,'',0,19300,,'',0,16400,,'',0,11200,,'',0,9300,,'',0,12100,,'',0,10900,,'',0
'3289',2201,90100,,'',0
-'3284',1002100,153500,,'',0,9500,,'',0
+'3486',2201,152600,,'',0
+'3487',2201,83100,,'',0
+'3486',1002100,153500,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107020 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107020
index 609e950b..acdeebc1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107020
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107020
@@ -1,19 +1,19 @@
-'3284',601,62200,4,'',0,8400,4,'',0,3600,4,'',0,7700,4,'',0,3500,4,'',0,7800,4,'',0,8000,4,'',0,11700,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
-'3287',601,63000,4,'',0,12200,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10100,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10800,4,'',0,10200,4,'',0,10500,4,'',0,9900,4,'',0,10000,4,'',0,9400,4,'',0
'3288',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,9500,4,'',0,8800,4,'',0,5500,4,'',0,15500,4,'',0,11700,4,'',0
-'3284',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72600,4,'',0,7800,4,'',0,8500,4,'',0,3700,4,'',0,7500,4,'',0
-'3284',2100,70000,4,'',0,3300,4,'',0,9600,4,'',0,10500,4,'',0,11600,4,'',0,15000,4,'',0,12700,4,'',0,17400,4,'',0,20600,4,'',0,4800,4,'',0,15500,4,'',0,10800,4,'',0
-'3287',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19300,4,'',0,16400,4,'',0,11200,4,'',0,9300,4,'',0,12100,4,'',0,10900,4,'',0
+'3486',601,62200,4,'',0,8400,4,'',0,3600,4,'',0,7700,4,'',0,3500,4,'',0,7800,4,'',0,8000,4,'',0,11700,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
+'3489',601,63000,4,'',0,12200,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10100,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10800,4,'',0,10200,4,'',0,10500,4,'',0,9900,4,'',0,10000,4,'',0,9400,4,'',0
+'3486',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72600,4,'',0,7800,4,'',0,8500,4,'',0,3700,4,'',0,7500,4,'',0
'3288',2100,95800,4,'',0,17100,4,'',0,17100,4,'',0,13000,4,'',0,12900,4,'',0,16800,4,'',0,12800,4,'',0
-'3284',2201,152700,4,'',0
-'3285',2201,83200,4,'',0
+'3486',2100,70000,4,'',0,3300,4,'',0,9600,4,'',0,10500,4,'',0,11600,4,'',0,15000,4,'',0,12700,4,'',0,17400,4,'',0,20600,4,'',0,4800,4,'',0,15500,4,'',0,10800,4,'',0
+'3489',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19300,4,'',0,16400,4,'',0,11200,4,'',0,9300,4,'',0,12100,4,'',0,10900,4,'',0
'3289',2201,90200,4,'',0
-'3284',3101,64500,4,'',0,8500,4,'',0,7200,4,'',0,3300,4,'',0,7400,4,'',0,4800,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11100,4,'',0,11900,4,'',0,7900,4,'',0,7400,4,'',0,3600,4,'',0,6600,4,'',0,3100,4,'',0,1600,4,'',0,38300,4,'',0
-'3287',3101,81900,4,'',0,10300,4,'',0,10600,4,'',0,11000,4,'',0,11100,4,'',0,10900,4,'',0,15500,4,'',0,11500,4,'',0,10900,4,'',0,10800,4,'',0
+'3486',2201,152700,4,'',0
+'3487',2201,83200,4,'',0
'3288',3101,102800,4,'',0,21900,4,'',0,11000,4,'',0,15400,4,'',0,11500,4,'',0,11000,4,'',0
-'3284',1002100,153600,4,'',0,9500,4,'',0
-'3284',1003101,74800,4,'',0,7000,4,'',0,3600,4,'',0,7300,4,'',0,10400,4,'',0,10900,4,'',0,11100,4,'',0,15000,4,'',0,11700,4,'',0,9500,4,'',0,3800,4,'',0,7500,4,'',0,3000,4,'',0,6300,4,'',0,10500,4,'',0,8500,4,'',0,12200,4,'',0
-'3285',1003101,71700,4,'',0
-'3287',1003101,85200,4,'',0,10600,4,'',0,14600,4,'',0,11100,4,'',0,11200,4,'',0,10900,4,'',0,11500,4,'',0,15500,4,'',0,10700,4,'',0,11000,4,'',0,11500,4,'',0,9900,4,'',0
+'3486',3101,64500,4,'',0,8500,4,'',0,7200,4,'',0,3300,4,'',0,7400,4,'',0,4800,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11100,4,'',0,11900,4,'',0,7900,4,'',0,7400,4,'',0,3600,4,'',0,6600,4,'',0,3100,4,'',0,1600,4,'',0,38300,4,'',0
+'3489',3101,81900,4,'',0,10300,4,'',0,10600,4,'',0,11000,4,'',0,11100,4,'',0,10900,4,'',0,15500,4,'',0,11500,4,'',0,10900,4,'',0,10800,4,'',0
+'3486',1002100,153600,4,'',0,9500,4,'',0
'3288',1003101,92500,4,'',0,21400,4,'',0,7500,4,'',0,11000,4,'',0,11100,4,'',0,11400,4,'',0,15400,4,'',0,11000,4,'',0,10900,4,'',0,11500,4,'',0,10000,4,'',0
'3289',1003101,71700,4,'',0
+'3486',1003101,74800,4,'',0,7000,4,'',0,3600,4,'',0,7300,4,'',0,10400,4,'',0,10900,4,'',0,11100,4,'',0,15000,4,'',0,11700,4,'',0,9500,4,'',0,3800,4,'',0,7500,4,'',0,3000,4,'',0,6300,4,'',0,10500,4,'',0,8500,4,'',0,12200,4,'',0
+'3487',1003101,71700,4,'',0
+'3489',1003101,85200,4,'',0,10600,4,'',0,14600,4,'',0,11100,4,'',0,11200,4,'',0,10900,4,'',0,11500,4,'',0,15500,4,'',0,10700,4,'',0,11000,4,'',0,11500,4,'',0,9900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107021
index dcad35ab..6ac63fab 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107021
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107021
@@ -1,24 +1,24 @@
-'3284',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62300,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3486',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64500,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60200,,'',0
-'3287',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3489',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3288',501,61700,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60200,,'',0
-'3287',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60200,,'',0
+'3489',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',900,63000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',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
-'3284',2400,142100,0,'Ctr Loop',0
-'3284',2601,141500,,'',0
-'3285',2601,72500,,'',0
+'3489',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',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
+'3486',2400,142100,0,'Ctr Loop',0
'3289',2601,72500,,'',0
-'3287',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',2601,141500,,'',0
+'3487',2601,72500,,'',0
'3288',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107022
index 43d73166..d802f2f4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107022
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107022
@@ -1,24 +1,24 @@
-'3284',100,53600,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62400,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',100,53600,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60000,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64500,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60300,,'',0
-'3287',501,63600,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3489',401,60000,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',501,61700,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60300,,'',0
-'3287',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60300,,'',0
+'3489',501,63600,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',700,70100,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',900,63100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',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
-'3284',2400,142100,0,'Ctr Loop',0
-'3284',2601,141600,,'',0
-'3285',2601,72600,,'',0
+'3489',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',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
+'3486',2400,142100,0,'Ctr Loop',0
'3289',2601,72600,,'',0
-'3287',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',2601,141600,,'',0
+'3487',2601,72600,,'',0
'3288',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60100,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107023
index 33e165dc..9e7b67bd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107023
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107023
@@ -1,17 +1,17 @@
-'3284',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,63800,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3486',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64600,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60300,,'',0
-'3287',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3489',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3288',501,61800,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60300,,'',0
-'3287',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60300,,'',0
+'3489',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',900,63100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',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
-'3284',2400,142200,0,'Ctr Loop',0
-'3284',2601,141600,,'',0
-'3285',2601,72600,,'',0
+'3489',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',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
+'3486',2400,142200,0,'Ctr Loop',0
'3289',2601,72600,,'',0
+'3486',2601,141600,,'',0
+'3487',2601,72600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107024
index 3803b50c..0f70296c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107024
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107024
@@ -1,17 +1,17 @@
-'3284',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,63800,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3486',200,55700,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62100,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64600,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60300,,'',0
-'3287',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3489',401,60100,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3288',501,61800,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60300,,'',0
-'3287',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',501,63100,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60300,,'',0
+'3489',501,63700,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',900,63100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',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
-'3284',2400,142200,0,'Ctr Loop',0
-'3284',2601,141700,,'',0
-'3285',2601,72600,,'',0
+'3489',900,64100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',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
+'3486',2400,142200,0,'Ctr Loop',0
'3289',2601,72600,,'',0
+'3486',2601,141700,,'',0
+'3487',2601,72600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107025
index f7d65704..671aaf07 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107025
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107025
@@ -1,10 +1,10 @@
-'3284',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,63900,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60200,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3486',200,55800,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2800,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64700,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3287',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',401,60200,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3288',900,63200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,141800,,'',0
-'3285',2601,72700,,'',0
+'3489',900,64200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,72700,,'',0
+'3486',2601,141800,,'',0
+'3487',2601,72700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107026
index 394d5ca9..de5e2019 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107026
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107026
@@ -1,10 +1,10 @@
-'3284',200,55900,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,63900,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60200,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',200,55900,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62200,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64700,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3287',900,64300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',401,60200,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',900,63300,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,141900,,'',0
-'3285',2601,72800,,'',0
+'3489',900,64300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,72800,,'',0
+'3486',2601,141900,,'',0
+'3487',2601,72800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107027
index a053ab2d..b26d9808 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107027
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107027
@@ -1,10 +1,10 @@
-'3284',200,60000,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64000,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3287',401,60300,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',200,60000,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62300,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',401,64800,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3287',900,64400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',401,60300,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',900,63400,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142000,,'',0
-'3285',2601,72900,,'',0
+'3489',900,64400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,72900,,'',0
+'3486',2601,142000,,'',0
+'3487',2601,72900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107030 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107030
index 88902d40..7836bab7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107030
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107030
@@ -1,9 +1,9 @@
-'3284',200,60400,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3287',200,62700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64400,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,54600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3287',900,64500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',200,60400,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
+'3489',200,62700,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',900,63500,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142200,,'',0
-'3285',2601,73100,,'',0
+'3486',900,54600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
+'3489',900,64500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,73100,,'',0
+'3486',2601,142200,,'',0
+'3487',2601,73100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107031
index 2175dc9b..81db3ced 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107031
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107031
@@ -1,9 +1,9 @@
-'3284',200,60400,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
-'3287',200,62700,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3288',200,64400,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8700,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,54600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3287',900,64600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',200,60400,,'',0,2100,,'',0,3100,,'',0,7400,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
+'3489',200,62700,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3288',900,63600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142300,,'',0
-'3285',2601,73100,,'',0
+'3486',900,54600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
+'3489',900,64600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,73100,,'',0
+'3486',2601,142300,,'',0
+'3487',2601,73100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107032 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107032
index 66d22a92..06a430b9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107032
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107032
@@ -1,9 +1,9 @@
-'3284',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3287',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64500,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3287',900,64600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',200,60500,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
+'3489',200,62800,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',900,63600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142400,,'',0
-'3285',2601,73200,,'',0
+'3486',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
+'3489',900,64600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'3289',2601,73200,,'',0
+'3486',2601,142400,,'',0
+'3487',2601,73200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107033
index 422855d6..13a78fad 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107033
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107033
@@ -1,9 +1,9 @@
-'3284',200,60600,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3287',200,62900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64600,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,54700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',200,60600,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
+'3489',200,62900,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',900,63700,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142400,,'',0
-'3285',2601,73300,,'',0
+'3486',900,54700,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,64700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73300,,'',0
+'3486',2601,142400,,'',0
+'3487',2601,73300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107034
index 95f7aa1a..250817f8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107034
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107034
@@ -1,9 +1,9 @@
-'3284',200,60700,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3287',200,63000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,54800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,64800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',200,60700,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
+'3489',200,63000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',900,63800,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',2601,142500,,'',0
-'3285',2601,73400,,'',0
+'3486',900,54800,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,64800,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73400,,'',0
+'3486',2601,142500,,'',0
+'3487',2601,73400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107035
index 5d060b73..c32dfed5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107035
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107035
@@ -1,9 +1,9 @@
-'3284',200,60800,,'',0,2100,,'',0,7100,,'',0,3400,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
-'3287',200,63100,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3288',200,64800,,'',0,8300,,'',0,8100,,'',0,8800,,'',0,4700,,'',0,8700,,'',0,8700,,'',0,9400,,'',0,8900,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8400,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',900,55000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,64900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',200,60800,,'',0,2100,,'',0,7100,,'',0,3400,,'',0,7000,,'',0,2100,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,7100,,'',0,2400,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2800,,'',0
+'3489',200,63100,,'',0,8500,,'',0,3500,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7300,,'',0,3400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,2900,,'',0
'3288',900,63900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2601,142800,,'',0
-'3285',2601,73600,,'',0
+'3486',900,55000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,64900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73600,,'',0
+'3486',2601,142800,,'',0
+'3487',2601,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107036
index 545cdf34..2d03a72f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107036
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107036
@@ -1,6 +1,6 @@
-'3284',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2601,142900,,'',0
-'3285',2601,73700,,'',0
+'3486',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73700,,'',0
+'3486',2601,142900,,'',0
+'3487',2601,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107037
index 4902bda0..5f75bd5e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107037
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107037
@@ -1,6 +1,6 @@
-'3284',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2601,142900,,'',0
-'3285',2601,73700,,'',0
+'3486',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73700,,'',0
+'3486',2601,142900,,'',0
+'3487',2601,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107038
index 0c8527fa..c243c365 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107038
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107038
@@ -1,6 +1,6 @@
-'3284',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2601,143000,,'',0
-'3285',2601,73800,,'',0
+'3486',900,55100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65000,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73800,,'',0
+'3486',2601,143000,,'',0
+'3487',2601,73800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107039
index c8bd82c9..dde3da3a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107039
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107039
@@ -1,6 +1,6 @@
-'3284',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2601,143000,,'',0
-'3285',2601,73800,,'',0
+'3486',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73800,,'',0
+'3486',2601,143000,,'',0
+'3487',2601,73800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107040
index 1d3ced3a..19d2ff06 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107040
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107040
@@ -1,5 +1,5 @@
-'3284',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,73900,,'',0
+'3486',900,55200,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73900,,'',0
+'3487',2601,73900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107041
index 8a634817..24253271 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107041
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107041
@@ -1,5 +1,5 @@
-'3284',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,73900,,'',0
+'3486',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,73900,,'',0
+'3487',2601,73900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107042
index 51877c08..62797c15 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107042
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107042
@@ -1,5 +1,5 @@
-'3284',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74000,,'',0
+'3486',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74000,,'',0
+'3487',2601,74000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107043
index 51877c08..62797c15 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107043
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107043
@@ -1,5 +1,5 @@
-'3284',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74000,,'',0
+'3486',900,55300,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74000,,'',0
+'3487',2601,74000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107044
index ed480757..394af24c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107044
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107044
@@ -1,5 +1,5 @@
-'3284',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74000,,'',0
+'3486',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74000,,'',0
+'3487',2601,74000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107045
index a15533c4..e62d14ab 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107045
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107045
@@ -1,7 +1,7 @@
-'3284',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3285',2601,74100,,'',0
+'3486',900,55400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65300,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3289',2601,74100,,'',0
+'3487',2601,74100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107046
index 9a48f356..214144b8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107046
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107046
@@ -1,7 +1,7 @@
-'3284',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3285',2601,74200,,'',0
+'3486',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3289',2601,74200,,'',0
+'3487',2601,74200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107047
index 9a48f356..214144b8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107047
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107047
@@ -1,7 +1,7 @@
-'3284',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3285',2601,74200,,'',0
+'3486',900,55500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65400,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1501,62300,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3289',2601,74200,,'',0
+'3487',2601,74200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107048
index 11fba04f..cb847d80 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107048
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107048
@@ -1,5 +1,5 @@
-'3284',900,55600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64500,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74300,,'',0
+'3486',900,55600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74300,,'',0
+'3487',2601,74300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107049
index ae3e0c0a..4ed10f13 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107049
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107049
@@ -1,5 +1,5 @@
-'3284',900,55600,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,5900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64500,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74400,,'',0
+'3486',900,55600,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,5900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65500,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74400,,'',0
+'3487',2601,74400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107050
index 3741913a..569f14fd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107050
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107050
@@ -1,5 +1,5 @@
-'3284',900,55700,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74500,,'',0
+'3486',900,55700,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74500,,'',0
+'3487',2601,74500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107051
index 8d807b4c..9f2f7ad3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107051
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107051
@@ -1,5 +1,5 @@
-'3284',900,55800,,'',0,10100,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14600,,'',0
-'3287',900,65700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64700,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74700,,'',0
+'3486',900,55800,,'',0,10100,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14600,,'',0
+'3489',900,65700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74700,,'',0
+'3487',2601,74700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107052 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107052
index 14df586c..c882aa9e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107052
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107052
@@ -1,5 +1,5 @@
-'3284',900,55900,,'',0,10000,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
-'3287',900,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74700,,'',0
+'3486',900,55900,,'',0,10000,,'',0,14200,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10600,,'',0
+'3489',900,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74700,,'',0
+'3487',2601,74700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107053
index e7192f40..e419a068 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107053
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107053
@@ -1,8 +1,8 @@
-'3284',900,55900,4,'',0,14100,4,'',0,10200,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10600,4,'',0
-'3284',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',900,65800,4,'',0,9500,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'3287',901,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',900,64800,4,'',0,17000,4,'',0,13100,4,'',0,17000,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17000,4,'',0
'3288',901,64800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74800,,'',0
+'3486',900,55900,4,'',0,14100,4,'',0,10200,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10600,4,'',0
+'3486',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',900,65800,4,'',0,9500,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'3489',901,65800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74800,,'',0
+'3487',2601,74800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107054
index 4a9659a6..5089b4dc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107054
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107054
@@ -1,5 +1,5 @@
-'3284',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,64900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74900,,'',0
+'3486',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74900,,'',0
+'3487',2601,74900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107055
index 0824a566..b2dab6fb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107055
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107055
@@ -1,5 +1,5 @@
-'3284',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,64900,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3285',2601,74900,,'',0
+'3486',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,65900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2601,74900,,'',0
+'3487',2601,74900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107056
index c0d17733..d0fc5429 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107056
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107056
@@ -1,7 +1,7 @@
-'3284',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1500,64000,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3285',2601,75000,,'',0
+'3486',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1500,64000,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3289',2601,75000,,'',0
+'3487',2601,75000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107057
index a2f57dcb..d34b9e4e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107057
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107057
@@ -1,7 +1,7 @@
-'3284',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65000,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1500,64100,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3285',2601,75000,,'',0
+'3486',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70000,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1500,64100,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3289',2601,75000,,'',0
+'3487',2601,75000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107058
index 91dafcdd..02975f32 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107058
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107058
@@ -1,3 +1,3 @@
-'3284',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3486',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107059
index 5934e264..f127c225 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107059
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107059
@@ -1,3 +1,3 @@
-'3284',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3486',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70100,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107060
index 9178c4cc..9aefc98e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107060
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107060
@@ -1,3 +1,3 @@
-'3284',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
+'3486',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107061
index 614f3a3c..c94ec3ae 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107061
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107061
@@ -1,5 +1,5 @@
-'3284',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65200,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',1501,62300,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70200,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',1501,62300,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107062
index 21d0df5c..2cd2b37e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107062
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107062
@@ -1,2 +1,2 @@
-'3284',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107063
index 83e96b23..d27d3d9d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107063
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107063
@@ -1,4 +1,4 @@
-'3284',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,145800,0,'Montrose Exch Only',0
+'3486',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',2600,145800,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107064 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107064
index 83e96b23..d27d3d9d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107064
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107064
@@ -1,4 +1,4 @@
-'3284',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65300,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,145800,0,'Montrose Exch Only',0
+'3486',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70300,,'',0,5500,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',2600,145800,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107065
index 79a2a66b..67d2193a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107065
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107065
@@ -1,4 +1,4 @@
-'3284',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,145900,0,'Montrose Exch Only',0
+'3486',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',2600,145900,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107066
index 79a2a66b..67d2193a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107066
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107066
@@ -1,4 +1,4 @@
-'3284',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,145900,0,'Montrose Exch Only',0
+'3486',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',2600,145900,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107067
index c4a00cd2..a5d5c699 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107067
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107067
@@ -1,4 +1,4 @@
-'3284',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65400,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150000,0,'Montrose Exch Only',0
+'3486',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70400,,'',0,5500,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',2600,150000,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107068
index d3975863..515d061f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107068
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107068
@@ -1,6 +1,6 @@
-'3284',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150200,0,'Montrose Exch Only',0
-'3285',2600,81000,,'',0
+'3486',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81000,,'',0
+'3486',2600,150200,0,'Montrose Exch Only',0
+'3487',2600,81000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107069
index d3975863..515d061f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107069
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107069
@@ -1,6 +1,6 @@
-'3284',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3288',901,65600,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150200,0,'Montrose Exch Only',0
-'3285',2600,81000,,'',0
+'3486',901,60700,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70600,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81000,,'',0
+'3486',2600,150200,0,'Montrose Exch Only',0
+'3487',2600,81000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107070
index d14622bc..6d952163 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107070
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107070
@@ -1,9 +1,9 @@
-'3284',201,51700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,60700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',201,51700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,60700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,65700,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150300,0,'Montrose Exch Only',0
-'3285',2600,81100,,'',0
+'3486',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70700,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81100,,'',0
+'3486',2600,150300,0,'Montrose Exch Only',0
+'3487',2600,81100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107071
index e6f7fd9e..29320ba4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107071
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107071
@@ -1,9 +1,9 @@
-'3284',201,51800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,60800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62300,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',201,51800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,60800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,65800,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150400,0,'Montrose Exch Only',0
-'3285',2600,81200,,'',0
+'3486',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70800,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81200,,'',0
+'3486',2600,150400,0,'Montrose Exch Only',0
+'3487',2600,81200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107072
index ec9b6894..79d70c33 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107072
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107072
@@ -1,9 +1,9 @@
-'3284',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,65900,,'',0,17000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150600,0,'Montrose Exch Only',0
-'3285',2600,81300,,'',0
+'3486',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70900,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81300,,'',0
+'3486',2600,150600,0,'Montrose Exch Only',0
+'3487',2600,81300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107073 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107073
index 5761c009..20511450 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107073
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107073
@@ -1,9 +1,9 @@
-'3284',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62500,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,70900,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,65900,,'',0,17000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',2600,150600,0,'Montrose Exch Only',0
-'3285',2600,81400,,'',0
+'3486',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,70900,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81400,,'',0
+'3486',2600,150600,0,'Montrose Exch Only',0
+'3487',2600,81400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107074 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107074
index 69e172ba..d86db277 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107074
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107074
@@ -1,9 +1,9 @@
-'3284',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62600,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,70000,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',2600,150700,0,'Montrose Exch Only',0
-'3285',2600,81500,,'',0
+'3486',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71000,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81500,,'',0
+'3486',2600,150700,0,'Montrose Exch Only',0
+'3487',2600,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107075 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107075
index 70587954..85eefb5b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107075
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107075
@@ -1,9 +1,9 @@
-'3284',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62600,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,70100,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150800,0,'Montrose Exch Only',0
-'3285',2600,81500,,'',0
+'3486',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71100,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81500,,'',0
+'3486',2600,150800,0,'Montrose Exch Only',0
+'3487',2600,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107076 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107076
index d88479d9..8272f1a0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107076
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107076
@@ -1,9 +1,9 @@
-'3284',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62700,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52200,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61200,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,70100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',2600,150800,0,'Montrose Exch Only',0
-'3285',2600,81600,,'',0
+'3486',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71100,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81600,,'',0
+'3486',2600,150800,0,'Montrose Exch Only',0
+'3487',2600,81600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107077
index 718b96c8..cacba8af 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107077
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107077
@@ -1,9 +1,9 @@
-'3284',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62800,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,70200,,'',0,13000,,'',0,17100,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17000,,'',0
-'3284',2600,150900,0,'Montrose Exch Only',0
-'3285',2600,81600,,'',0
+'3486',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71200,,'',0,9500,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81600,,'',0
+'3486',2600,150900,0,'Montrose Exch Only',0
+'3487',2600,81600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107078
index 2fd1b5f7..ba86d023 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107078
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107078
@@ -1,10 +1,10 @@
-'3284',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62800,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71200,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',901,70200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',1601,80500,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
-'3284',2600,151000,0,'Montrose Exch Only',0
-'3285',2600,81700,,'',0
+'3486',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71200,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',1601,80500,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
'3289',2600,81700,,'',0
+'3486',2600,151000,0,'Montrose Exch Only',0
+'3487',2600,81700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107079
index ec11389c..40f729cf 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107079
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107079
@@ -1,27 +1,27 @@
-'3284',100,54100,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62800,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',100,54100,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',201,62800,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,4900,,'',0,9500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',300,55900,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63000,,'',0
-'3287',300,60200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3486',201,52300,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,61300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',300,64200,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63000,,'',0
-'3284',400,62600,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,63100,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
+'3486',300,55900,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63000,,'',0
+'3489',300,60200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',400,71600,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3287',700,70500,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',400,62600,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,63100,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
'3288',700,60500,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3284',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
-'3287',901,71200,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3489',700,70500,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',901,70200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',1500,64900,,'',0,8600,,'',0,12200,,'',0,68100,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,93500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',1601,80500,,'',0,12200,,'',0,68300,,'',0,4700,,'',0
-'3284',2600,151000,0,'Montrose Exch Only',0
-'3285',2600,81700,,'',0
+'3486',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0
+'3489',901,71200,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',1500,64900,,'',0,8600,,'',0,12200,,'',0,68100,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,93500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1601,80500,,'',0,12200,,'',0,68300,,'',0,4700,,'',0
'3289',2600,81700,,'',0
-'3287',1000700,60500,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',2600,151000,0,'Montrose Exch Only',0
+'3487',2600,81700,,'',0
'3288',1000700,70500,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60500,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107081
index a2c036d5..2222547a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107081
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107081
@@ -1,9 +1,9 @@
-'3284',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2700,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3486',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2700,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,71800,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3287',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3489',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3288',901,70400,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3285',2600,82000,,'',0
+'3489',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,82000,,'',0
+'3487',2600,82000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107082
index 0f556307..3be2ad6f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107082
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107082
@@ -1,9 +1,9 @@
-'3284',201,52800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1500,,'',0,1000,0,'Bourquin Exch Only',0,1200,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,61800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63300,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63400,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3486',201,52800,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1500,,'',0,1000,0,'Bourquin Exch Only',0,1200,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,61800,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,71900,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3287',901,71500,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3489',400,63400,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3288',901,70500,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3285',2600,82100,,'',0
+'3489',901,71500,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,82100,,'',0
+'3487',2600,82100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107083
index e6db38d9..76667f3b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107083
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107083
@@ -1,16 +1,16 @@
-'3284',201,52900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,1000,0,'Bourquin Exch Only',0,5200,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,61900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63400,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63500,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3486',201,52900,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,1000,0,'Bourquin Exch Only',0,5200,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,61900,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,72000,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',500,61900,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3400,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74500,,'',0
-'3287',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3489',400,63500,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3288',500,64800,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74500,,'',0
-'3287',901,71600,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',500,61900,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3400,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74500,,'',0
+'3489',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',901,70600,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',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
-'3284',2401,81200,0,'Ctr Loop',0
-'3285',2600,82200,,'',0
+'3489',901,71600,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',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
+'3486',2401,81200,0,'Ctr Loop',0
'3289',2600,82200,,'',0
+'3487',2600,82200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107084
index 920b62e5..573dc41c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107084
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107084
@@ -1,16 +1,16 @@
-'3284',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
+'3486',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6800,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,72000,,'',0,20200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12800,,'',0
-'3284',500,62000,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74500,,'',0
-'3287',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3489',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
'3288',500,64900,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74500,,'',0
-'3287',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',500,62000,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7500,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74500,,'',0
+'3489',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
'3288',901,70700,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,12900,,'',0
-'3284',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
-'3284',2401,81300,0,'Ctr Loop',0
-'3285',2600,82300,,'',0
+'3489',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',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
+'3486',2401,81300,0,'Ctr Loop',0
'3289',2600,82300,,'',0
+'3487',2600,82300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107085 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107085
index fd4e6c6b..ca76a949 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107085
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107085
@@ -1,23 +1,23 @@
-'3284',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62300,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3284',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',101,54600,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62000,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63500,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
+'3486',201,53000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,1700,,'',0,1000,0,'Bourquin Exch Only',0,5100,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62000,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,72000,,'',0,20200,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12800,,'',0
-'3284',500,62000,,'',0,9300,,'',0,10900,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7400,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74600,,'',0
-'3287',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
+'3489',400,63500,,'',0,9000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9800,,'',0,10400,,'',0,9900,,'',0
'3288',500,64900,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74600,,'',0
-'3287',701,74000,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',500,62000,,'',0,9300,,'',0,10900,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,7400,,'',0,2900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74600,,'',0
+'3489',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,9400,,'',0
'3288',701,63900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3287',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3489',701,74000,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',901,70700,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,12900,,'',0
-'3284',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
-'3284',2401,81400,0,'Ctr Loop',0
-'3285',2600,82400,,'',0
+'3489',901,71700,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',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
+'3486',2401,81400,0,'Ctr Loop',0
'3289',2600,82400,,'',0
-'3287',1000701,64000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3487',2600,82400,,'',0
'3288',1000701,74100,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3489',1000701,64000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107087
index 539a91fd..3980ba13 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107087
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107087
@@ -1,14 +1,14 @@
-'3284',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62200,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62500,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3284',201,53200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62200,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3486',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62200,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63700,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3284',1701,62700,,'',0,3200,,'',0,8700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,55900,,'',0,7200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
-'3287',2101,73800,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3486',201,53200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62200,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3486',1701,62700,,'',0,3200,,'',0,8700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90000,,'',0,13000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2201,144700,,'',0
-'3285',2201,80100,,'',0
+'3486',2101,55900,,'',0,7200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
+'3489',2101,73800,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
'3289',2201,83100,,'',0
-'3284',1002101,71900,,'',0
+'3486',2201,144700,,'',0
+'3487',2201,80100,,'',0
+'3486',1002101,71900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107088
index de92c0f2..7aace600 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107088
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107088
@@ -1,14 +1,14 @@
-'3284',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62300,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7300,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62600,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3284',201,53300,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62300,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7300,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63800,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3284',1701,62800,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60000,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
-'3287',2101,73800,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3486',201,53300,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62300,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',1701,62800,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90000,,'',0,13000,,'',0,12800,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2201,144800,,'',0
-'3285',2201,80200,,'',0
+'3486',2101,60000,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
+'3489',2101,73800,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
'3289',2201,83200,,'',0
-'3284',1002101,71900,,'',0
+'3486',2201,144800,,'',0
+'3487',2201,80200,,'',0
+'3486',1002101,71900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107089 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107089
index bc6559f0..5587747a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107089
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107089
@@ -1,14 +1,14 @@
-'3284',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62300,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62600,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3284',201,53300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62300,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3486',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62300,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3284',1701,62800,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12700,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
-'3287',2101,73900,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',201,53300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62300,,'',0,3500,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3486',1701,62800,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90100,,'',0,13000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2201,144900,,'',0
-'3285',2201,80200,,'',0
+'3486',2101,60000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12700,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11200,,'',0
+'3489',2101,73900,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
'3289',2201,83200,,'',0
-'3284',1002101,72000,,'',0
+'3486',2201,144900,,'',0
+'3487',2201,80200,,'',0
+'3486',1002101,72000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107090
index 767cf0da..09610376 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107090
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107090
@@ -1,14 +1,14 @@
-'3284',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62400,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62700,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3284',201,53400,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62400,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62400,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63900,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3284',1701,62900,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60100,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3287',2101,73900,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3486',201,53400,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62400,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',1701,62900,,'',0,7200,,'',0,4700,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90100,,'',0,13000,,'',0,12800,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2201,145000,,'',0
-'3285',2201,80300,,'',0
+'3486',2101,60100,,'',0,3200,,'',0,20000,,'',0,11600,,'',0,11000,,'',0,16200,,'',0,12600,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
+'3489',2101,73900,,'',0,20000,,'',0,11700,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
'3289',2201,83300,,'',0
-'3284',1002101,72000,,'',0
+'3486',2201,145000,,'',0
+'3487',2201,80300,,'',0
+'3486',1002101,72000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107091 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107091
index 4d995305..881167fb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107091
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107091
@@ -1,12 +1,12 @@
-'3284',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62400,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,62700,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3284',201,53500,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62500,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62400,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,2900,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',201,64000,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3284',1701,63000,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60200,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3287',2101,74100,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',201,53500,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62500,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',1701,63000,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2401,75900,0,'Ctr Loop',0
-'3284',1002101,72200,,'',0
+'3486',2101,60200,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
+'3489',2101,74100,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',2401,75900,0,'Ctr Loop',0
+'3486',1002101,72200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107092
index 4dc83bb2..ef92c2fc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107092
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107092
@@ -1,6 +1,6 @@
-'3284',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62500,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,62800,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3284',201,53600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62600,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62500,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',201,64100,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,4600,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3486',201,53600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62600,,'',0,7500,,'',0,2500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107093
index 26b11227..2788d0d2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107093
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107093
@@ -1,6 +1,6 @@
-'3284',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62600,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,5000,,'',0
'3288',101,62900,,'',0,8000,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
-'3284',201,53600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62600,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
+'3486',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62600,,'',0,8000,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,5000,,'',0
'3288',201,64100,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8600,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3486',201,53600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62600,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107094 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107094
index 6fb99cc8..ccdb2112 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107094
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107094
@@ -1,11 +1,11 @@
-'3284',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64200,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8600,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
-'3284',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61500,,'',0
-'3287',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3486',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',300,63000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61500,,'',0
-'3284',2201,151400,,'',0
-'3285',2201,82300,,'',0
+'3486',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61500,,'',0
+'3489',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3289',2201,85300,,'',0
+'3486',2201,151400,,'',0
+'3487',2201,82300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107095 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107095
index 8a81128a..11932ae4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107095
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107095
@@ -1,6 +1,6 @@
-'3284',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64200,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3284',2201,151500,,'',0
-'3285',2201,82300,,'',0
+'3486',201,53700,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62700,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3289',2201,85300,,'',0
+'3486',2201,151500,,'',0
+'3487',2201,82300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107096 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107096
index bbb787a0..188d3342 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107096
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107096
@@ -1,6 +1,6 @@
-'3284',201,53800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62800,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64300,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3284',2201,151600,,'',0
-'3285',2201,82400,,'',0
+'3486',201,53800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62800,,'',0,7500,,'',0,2600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3289',2201,85400,,'',0
+'3486',2201,151600,,'',0
+'3487',2201,82400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107097 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107097
index 63643cc7..f1340fb0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107097
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107097
@@ -1,6 +1,6 @@
-'3284',201,53900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,62900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64400,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
-'3284',2201,145700,,'',0
-'3285',2201,80800,,'',0
+'3486',201,53900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,62900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3289',2201,83800,,'',0
+'3486',2201,145700,,'',0
+'3487',2201,80800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107098 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107098
index 8be884b6..6d359da3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107098
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107098
@@ -1,3 +1,3 @@
-'3284',201,54000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64500,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,4400,,'',0,8900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107099 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107099
index 2a667e61..75e6e08b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107099
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107099
@@ -1,3 +1,3 @@
-'3284',201,54200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63200,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64700,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63200,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107100 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107100
index 290bd8fe..1c487fbe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107100
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107100
@@ -1,3 +1,3 @@
-'3284',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107101 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107101
index a6ec48b8..11e7f96d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107101
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107101
@@ -1,3 +1,3 @@
-'3284',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64800,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107102 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107102
index b8d6669a..cd8bc72e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107102
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107102
@@ -1,3 +1,3 @@
-'3284',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64900,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107107 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107107
index 8f9df055..42414a5b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107107
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107107
@@ -1,6 +1,6 @@
-'3284',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,60900,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
-'3284',200,53700,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60100,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3486',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,61800,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3486',200,53700,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60100,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107108 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107108
index 9c34d9c2..3d099d2b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107108
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107108
@@ -1,3 +1,3 @@
-'3284',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1500,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,60900,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3486',100,52000,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1500,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,60700,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107109 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107109
index a10918d8..440f47be 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107109
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107109
@@ -1,3 +1,3 @@
-'3284',100,52100,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,60800,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61000,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3486',100,52100,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,60800,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107110 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107110
index cd6245e8..6fa365a7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107110
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107110
@@ -1,6 +1,6 @@
-'3284',100,52100,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,60900,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61000,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
-'3284',200,53800,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60200,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3486',100,52100,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,60900,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,61900,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3486',200,53800,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60200,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107111 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107111
index 56d7ec25..cd2e4a6d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107111
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107111
@@ -1,6 +1,6 @@
-'3284',100,52200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,60900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61100,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3284',200,53800,,'',0,2000,,'',0,7000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60200,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
+'3486',100,52200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5400,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,60900,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',200,61900,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
+'3486',200,53800,,'',0,2000,,'',0,7000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60200,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107112 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107112
index 463ea067..688a5a59 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107112
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107112
@@ -1,3 +1,3 @@
-'3284',100,52300,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61100,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61200,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3486',100,52300,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61100,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107113 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107113
index 1073f566..d7103e33 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107113
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107113
@@ -1,3 +1,3 @@
-'3284',100,52400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61300,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
+'3486',100,52400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61100,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107115 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107115
index 9d581d32..e7e4b1b6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107115
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107115
@@ -1,3 +1,3 @@
-'3284',100,52500,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61400,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
+'3486',100,52500,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107116 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107116
index 742ae4ff..bde9ad6e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107116
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107116
@@ -1,6 +1,6 @@
-'3284',100,52600,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61500,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3284',2201,151000,,'',0
-'3285',2201,81900,,'',0
+'3486',100,52600,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61400,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3289',2201,84900,,'',0
+'3486',2201,151000,,'',0
+'3487',2201,81900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107117 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107117
index 11cc4632..eca3d150 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107117
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107117
@@ -1,6 +1,6 @@
-'3284',100,52700,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61600,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3284',2201,151100,,'',0
-'3285',2201,82000,,'',0
+'3486',100,52700,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3200,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3289',2201,85000,,'',0
+'3486',2201,151100,,'',0
+'3487',2201,82000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107118 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107118
index eca5fcd0..81e2fd5e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107118
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107118
@@ -1,6 +1,6 @@
-'3284',100,52800,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',100,61600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61600,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3284',2201,151200,,'',0
-'3285',2201,82100,,'',0
+'3486',100,52800,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',100,61600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3289',2201,85100,,'',0
+'3486',2201,151200,,'',0
+'3487',2201,82100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107119 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107119
index a4a27989..10fb26bc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107119
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107119
@@ -1,6 +1,6 @@
-'3284',100,52900,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61700,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9600,,'',0,15900,,'',0
-'3284',2201,151300,,'',0
-'3285',2201,82200,,'',0
+'3486',100,52900,,'',0,8600,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2300,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3289',2201,85200,,'',0
+'3486',2201,151300,,'',0
+'3487',2201,82200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107120 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107120
index 3c944c96..057c4472 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107120
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107120
@@ -1,3 +1,3 @@
-'3284',100,52900,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61700,,'',0,3100,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8700,,'',0,8900,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,5600,,'',0,15900,,'',0
+'3486',100,52900,,'',0,8600,,'',0,3100,,'',0,7200,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6900,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',100,61700,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,7500,,'',0,2200,,'',0,3200,,'',0,7500,,'',0,2500,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107121 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107121
index ff78c83d..3126a57b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107121
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107121
@@ -1,10 +1,10 @@
-'3284',301,60700,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,73000,,'',0
-'3287',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63700,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',301,73000,,'',0
-'3284',500,61100,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73500,,'',0
-'3287',500,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',301,60700,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,73000,,'',0
+'3489',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',500,64100,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',500,73500,,'',0
+'3486',500,61100,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73500,,'',0
+'3489',500,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107122 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107122
index d4a98092..b0d87a28 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107122
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107122
@@ -1,23 +1,23 @@
-'3284',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3284',301,60000,,'',0,5200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',300,62300,,'',0
-'3285',301,72200,,'',0
-'3287',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3287',301,65000,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',300,63700,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3288',301,63000,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',300,62300,,'',0
'3289',301,72200,,'',0
-'3284',601,55600,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',300,55300,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3486',301,60000,,'',0,5200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',300,62300,,'',0
+'3487',301,72200,,'',0
+'3489',300,55600,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3489',301,65000,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,73600,0,'Ctr Loop',0
-'3284',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90300,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',601,55600,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,73600,0,'Ctr Loop',0
'3288',3100,111700,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3287',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90300,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82600,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62400,,'',0,3000,,'',0
-'3285',24003100,55500,,'',0
+'3486',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
+'3489',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55500,,'',0
+'3486',24003100,62400,,'',0,3000,,'',0
+'3487',24003100,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107123 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107123
index 0d0194fe..91583163 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107123
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107123
@@ -1,23 +1,23 @@
-'3284',300,55300,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3284',301,60000,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',300,62400,,'',0
-'3285',301,72300,,'',0
-'3287',300,55600,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3287',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',300,63700,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3288',301,63000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',300,62400,,'',0
'3289',301,72300,,'',0
-'3284',601,55600,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',300,55300,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3486',301,60000,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',300,62400,,'',0
+'3487',301,72300,,'',0
+'3489',300,55600,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3489',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,73700,0,'Ctr Loop',0
-'3284',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90300,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',601,55600,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,73700,0,'Ctr Loop',0
'3288',3100,111700,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3287',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72200,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90300,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82600,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62400,,'',0,3000,,'',0
-'3285',24003100,55500,,'',0
+'3486',1003100,63700,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
+'3489',1003100,82600,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55500,,'',0
+'3486',24003100,62400,,'',0,3000,,'',0
+'3487',24003100,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107124 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107124
index cdb5fad4..9eed6960 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107124
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107124
@@ -1,18 +1,18 @@
-'3284',300,55400,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62400,,'',0
-'3287',300,55700,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63800,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3289',300,62400,,'',0
-'3284',601,55700,,'',0,8000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',300,55400,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62400,,'',0
+'3489',300,55700,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,73800,0,'Ctr Loop',0
-'3284',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90400,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',601,55700,,'',0,8000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,73800,0,'Ctr Loop',0
'3288',3100,111800,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90400,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82700,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62500,,'',0,3000,,'',0
-'3285',24003100,55600,,'',0
+'3486',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55600,,'',0
+'3486',24003100,62500,,'',0,3000,,'',0
+'3487',24003100,55600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107125 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107125
index cfd7b963..30317b0d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107125
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107125
@@ -1,18 +1,18 @@
-'3284',300,55500,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62500,,'',0
-'3287',300,55800,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63800,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3289',300,62500,,'',0
-'3284',601,55700,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',300,55500,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62500,,'',0
+'3489',300,55800,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,73800,0,'Ctr Loop',0
-'3284',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90400,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',601,55700,,'',0,8000,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60600,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,73800,0,'Ctr Loop',0
'3288',3100,111800,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3287',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72300,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90400,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82700,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62500,,'',0,3000,,'',0
-'3285',24003100,55600,,'',0
+'3486',1003100,63800,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
+'3489',1003100,82700,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55600,,'',0
+'3486',24003100,62500,,'',0,3000,,'',0
+'3487',24003100,55600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107126 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107126
index c4003cb2..729ee4ca 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107126
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107126
@@ -1,18 +1,18 @@
-'3284',300,55500,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62600,,'',0
-'3287',300,55800,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63900,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,62600,,'',0
-'3284',601,55700,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60600,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',300,55500,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62600,,'',0
+'3489',300,55800,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,73900,0,'Ctr Loop',0
-'3284',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90500,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',601,55700,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60600,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,73900,0,'Ctr Loop',0
'3288',3100,111900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90500,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82800,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62600,,'',0,3000,,'',0
-'3285',24003100,55700,,'',0
+'3486',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55700,,'',0
+'3486',24003100,62600,,'',0,3000,,'',0
+'3487',24003100,55700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107127 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107127
index d559ad6f..bc6d4230 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107127
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107127
@@ -1,14 +1,14 @@
-'3284',300,55600,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62700,,'',0
-'3287',300,55900,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,62700,,'',0
-'3284',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90500,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',300,55600,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62700,,'',0
+'3489',300,55900,,'',0,10000,,'',0,10000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',3100,111900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3287',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72400,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90500,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82800,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62600,,'',0,3000,,'',0
-'3285',24003100,55700,,'',0
+'3486',1003100,63900,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
+'3489',1003100,82800,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55700,,'',0
+'3486',24003100,62600,,'',0,3000,,'',0
+'3487',24003100,55700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107128 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107128
index 8f205c1a..0620db54 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107128
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107128
@@ -1,14 +1,14 @@
-'3284',300,55700,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62800,,'',0
-'3287',300,60000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64100,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,62800,,'',0
-'3284',3100,72500,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90600,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',300,55700,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62800,,'',0
+'3489',300,60000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',3100,112000,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,64000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,82900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72500,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90600,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82900,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62700,,'',0,3000,,'',0
-'3285',24003100,55800,,'',0
+'3486',1003100,64000,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,82900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55800,,'',0
+'3486',24003100,62700,,'',0,3000,,'',0
+'3487',24003100,55800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107129 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107129
index 5e5c5e8b..6e1a784b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107129
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107129
@@ -1,14 +1,14 @@
-'3284',300,55800,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62900,,'',0
-'3287',300,60100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64100,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,62900,,'',0
-'3284',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90700,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',300,55800,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62900,,'',0
+'3489',300,60100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',3100,112100,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90700,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,83000,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62800,,'',0,3000,,'',0
-'3285',24003100,55900,,'',0
+'3486',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55900,,'',0
+'3486',24003100,62800,,'',0,3000,,'',0
+'3487',24003100,55900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107130 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107130
index 9ff26b8d..6833ec11 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107130
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107130
@@ -1,8 +1,8 @@
-'3284',100,54500,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63200,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',300,60300,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63400,,'',0
-'3287',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3486',100,54500,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',300,64600,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63400,,'',0
+'3486',300,60300,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63400,,'',0
+'3489',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107131 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107131
index b6f621e4..5277737c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107131
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107131
@@ -1,8 +1,8 @@
-'3284',100,54500,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63200,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3284',300,60300,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,63500,,'',0
-'3287',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
+'3486',100,54500,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63300,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',300,64600,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3289',300,63500,,'',0
+'3486',300,60300,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,63500,,'',0
+'3489',300,60600,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107132 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107132
index de7e1160..9ebed474 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107132
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107132
@@ -1,8 +1,8 @@
-'3284',100,54600,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63400,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63300,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',300,60400,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63500,,'',0
-'3287',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
+'3486',100,54600,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2800,,'',0,6100,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63400,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',300,64700,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63500,,'',0
+'3486',300,60400,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63500,,'',0
+'3489',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107133 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107133
index 770271a4..de72cd73 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107133
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107133
@@ -1,5 +1,5 @@
-'3284',300,60400,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,63600,,'',0
-'3287',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
'3288',300,64700,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3289',300,63600,,'',0
+'3486',300,60400,,'',0,10200,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,63600,,'',0
+'3489',300,60700,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107134 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107134
index 7d9df617..db7a81cc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107134
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107134
@@ -1,5 +1,5 @@
-'3284',300,60500,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63600,,'',0
-'3287',300,60800,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64800,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63600,,'',0
+'3486',300,60500,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63600,,'',0
+'3489',300,60800,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107135 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107135
index bb1ab7ae..1ff2dc56 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107135
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107135
@@ -1,5 +1,5 @@
-'3284',300,60600,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63700,,'',0
-'3287',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64900,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63700,,'',0
+'3486',300,60600,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63700,,'',0
+'3489',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107136 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107136
index 2ba395b5..dbb1256c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107136
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107136
@@ -1,12 +1,12 @@
-'3284',300,60600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,63800,,'',0
-'3287',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
'3288',300,64900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10000,,'',0
'3289',300,63800,,'',0
-'3284',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',300,60600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,63800,,'',0
+'3489',300,60900,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,9500,,'',0,9000,,'',0
'3288',700,60900,,'',0,20000,,'',0,15000,,'',0,24100,,'',0,20000,,'',0,20000,,'',0,15900,,'',0,16500,,'',0
-'3284',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3284',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3288',1000700,70900,,'',0,19500,,'',0,15500,,'',0,24100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107137 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107137
index 0e6933b2..b571dc36 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107137
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107137
@@ -1,12 +1,12 @@
-'3284',300,60700,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63800,,'',0
-'3287',300,61000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0
'3288',300,65000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63800,,'',0
-'3284',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',300,60700,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63800,,'',0
+'3489',300,61000,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9600,,'',0,5500,,'',0,9000,,'',0
'3288',700,60900,,'',0,20000,,'',0,15000,,'',0,24100,,'',0,20000,,'',0,20000,,'',0,15900,,'',0,16500,,'',0
-'3284',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3284',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62300,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70900,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73800,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3288',1000700,70900,,'',0,19500,,'',0,15500,,'',0,24100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60900,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107138 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107138
index 10f17731..f68277b5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107138
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107138
@@ -1,5 +1,5 @@
-'3284',300,60800,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,64000,,'',0
-'3287',300,61100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3288',300,65100,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10100,,'',0,10000,,'',0
'3289',300,64000,,'',0
+'3486',300,60800,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,64000,,'',0
+'3489',300,61100,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107139 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107139
index e0e78e62..e107d1ea 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107139
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107139
@@ -1,5 +1,5 @@
-'3284',300,60900,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,64100,,'',0
-'3287',300,61200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3288',300,65200,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10100,,'',0,10000,,'',0
'3289',300,64100,,'',0
+'3486',300,60900,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,64100,,'',0
+'3489',300,61200,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107140 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107140
index 646cd95d..f69bcecc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107140
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107140
@@ -1,10 +1,10 @@
-'3284',300,62300,4,'',0,10200,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3700,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3000,4,'',0,8500,4,'',0,8400,4,'',0,9900,4,'',0,9400,4,'',0
-'3284',301,54000,,'',0,9000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8900,0,'Montrose Exch Only',0
-'3285',300,65500,4,'',0
-'3285',301,70000,,'',0
-'3287',300,62500,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,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,7000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0
-'3287',301,63000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',300,70500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0
'3288',301,61000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
'3289',300,65500,4,'',0
'3289',301,70000,,'',0
+'3486',300,62300,4,'',0,10200,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3700,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3000,4,'',0,8500,4,'',0,8400,4,'',0,9900,4,'',0,9400,4,'',0
+'3486',301,54000,,'',0,9000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8900,0,'Montrose Exch Only',0
+'3487',300,65500,4,'',0
+'3487',301,70000,,'',0
+'3489',300,62500,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3500,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,7000,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0
+'3489',301,63000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107141 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107141
index 13986d70..31c94ff8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107141
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107141
@@ -1,5 +1,5 @@
-'3284',300,62200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,65400,,'',0
-'3287',300,62400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3288',300,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,10000,,'',0,10000,,'',0
'3289',300,65400,,'',0
+'3486',300,62200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,65400,,'',0
+'3489',300,62400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107142 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107142
index bd4e0a0a..91207176 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107142
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107142
@@ -1,5 +1,5 @@
-'3284',300,61400,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,5900,,'',0,9400,,'',0
-'3285',300,64600,,'',0
-'3287',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3288',300,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3289',300,64600,,'',0
+'3486',300,61400,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,5900,,'',0,9400,,'',0
+'3487',300,64600,,'',0
+'3489',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107143 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107143
index acf0012b..03547e67 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107143
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107143
@@ -1,5 +1,5 @@
-'3284',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3285',300,64700,,'',0
-'3287',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3288',300,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3289',300,64700,,'',0
+'3486',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3487',300,64700,,'',0
+'3489',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107144 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107144
index acf0012b..03547e67 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107144
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107144
@@ -1,5 +1,5 @@
-'3284',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3285',300,64700,,'',0
-'3287',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3288',300,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3289',300,64700,,'',0
+'3486',300,61500,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3487',300,64700,,'',0
+'3489',300,61700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107145 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107145
index fc7a2713..858556d6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107145
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107145
@@ -1,5 +1,5 @@
-'3284',300,61600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
-'3285',300,64800,,'',0
-'3287',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
'3288',300,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3289',300,64800,,'',0
+'3486',300,61600,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,5400,,'',0
+'3487',300,64800,,'',0
+'3489',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107146 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107146
index 5e66b1fa..733bbbb0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107146
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107146
@@ -1,5 +1,5 @@
-'3284',300,61200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
-'3285',300,64400,,'',0
-'3287',300,61400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
'3288',300,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,10000,,'',0,10000,,'',0
'3289',300,64400,,'',0
+'3486',300,61200,,'',0,10200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,9900,,'',0,9400,,'',0
+'3487',300,64400,,'',0
+'3489',300,61400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,5500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107147 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107147
index b31abea6..93e7c2c4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107147
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107147
@@ -1,5 +1,5 @@
-'3284',301,54200,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70300,,'',0
-'3287',301,63200,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61200,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70300,,'',0
+'3486',301,54200,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70300,,'',0
+'3489',301,63200,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107148 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107148
index e2b0c886..f041d181 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107148
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107148
@@ -1,5 +1,5 @@
-'3284',301,54300,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70400,,'',0
-'3287',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70400,,'',0
+'3486',301,54300,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70400,,'',0
+'3489',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107149 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107149
index 551a4152..92881c7d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107149
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107149
@@ -1,11 +1,11 @@
-'3284',301,54400,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70500,,'',0
-'3287',301,63400,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61400,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70500,,'',0
-'3284',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',301,54400,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70500,,'',0
+'3489',301,63400,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',701,63000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73200,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107150 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107150
index 2dc28cf7..a0925dba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107150
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107150
@@ -1,11 +1,11 @@
-'3284',301,54500,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70600,,'',0
-'3287',301,63500,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61500,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70600,,'',0
-'3284',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',301,54500,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70600,,'',0
+'3489',301,63500,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',701,63000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73200,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80500,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,63100,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107151 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107151
index b0ed31d8..116ec472 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107151
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107151
@@ -1,5 +1,5 @@
-'3284',301,54600,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70700,,'',0
-'3287',301,63600,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
'3288',301,61600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,10000,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70700,,'',0
+'3486',301,54600,,'',0,9100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8500,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70700,,'',0
+'3489',301,63600,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107153 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107153
index 78c12e64..ccbd6d4e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107153
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107153
@@ -1,5 +1,5 @@
-'3284',301,54700,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70900,,'',0
-'3287',301,63700,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61700,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70900,,'',0
+'3486',301,54700,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70900,,'',0
+'3489',301,63700,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107154 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107154
index 5c682321..74619bc7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107154
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107154
@@ -1,8 +1,8 @@
-'3284',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61500,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',301,54800,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,71000,,'',0
-'3287',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3486',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',301,61800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,71000,,'',0
+'3486',301,54800,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,71000,,'',0
+'3489',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107155 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107155
index ab89d339..b164e603 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107155
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107155
@@ -1,8 +1,8 @@
-'3284',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61500,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',301,54800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,71000,,'',0
-'3287',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
+'3486',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61100,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',301,61800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,71000,,'',0
+'3486',301,54800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,71000,,'',0
+'3489',301,63800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107156 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107156
index 6f733778..4af742fb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107156
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107156
@@ -1,8 +1,8 @@
-'3284',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61600,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',301,54900,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,71100,,'',0
-'3287',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3486',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',301,61900,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,71100,,'',0
+'3486',301,54900,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,71100,,'',0
+'3489',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107157 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107157
index 0c442775..8be572c8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107157
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107157
@@ -1,8 +1,8 @@
-'3284',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61600,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',301,54900,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,71100,,'',0
-'3287',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
+'3486',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61200,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',301,61900,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,71100,,'',0
+'3486',301,54900,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,71100,,'',0
+'3489',301,63900,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8400,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107158 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107158
index 48766e7e..857d9bb0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107158
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107158
@@ -1,10 +1,10 @@
-'3284',301,55300,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71500,,'',0
-'3287',301,64300,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',301,62300,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3289',301,71500,,'',0
-'3284',401,60000,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,60500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',301,55300,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71500,,'',0
+'3489',301,64300,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',401,65000,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61500,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3287',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60000,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,60500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61500,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
+'3489',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107159 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107159
index fa101bb0..0395a940 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107159
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107159
@@ -1,13 +1,13 @@
-'3284',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71600,,'',0
-'3287',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',301,62400,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3289',301,71600,,'',0
-'3284',3101,64000,,'',0,8500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
-'3287',3101,81400,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3486',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71600,,'',0
+'3489',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',3101,102300,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71200,,'',0
-'3287',1003101,84700,,'',0,10600,,'',0,10600,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64000,,'',0,8500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
+'3489',3101,81400,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
'3288',1003101,92000,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71200,,'',0
+'3486',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71200,,'',0
+'3489',1003101,84700,,'',0,10600,,'',0,10600,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107160 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107160
index 2e5418fc..964d4f2b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107160
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107160
@@ -1,13 +1,13 @@
-'3284',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71600,,'',0
-'3287',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',301,62400,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,71600,,'',0
-'3284',3101,64100,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,81500,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3486',301,55400,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71600,,'',0
+'3489',301,64400,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',3101,102400,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71300,,'',0
-'3287',1003101,84800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64100,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,81500,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,92100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71300,,'',0
+'3486',1003101,74300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71300,,'',0
+'3489',1003101,84800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107161 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107161
index a237584a..5960bf01 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107161
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107161
@@ -1,13 +1,13 @@
-'3284',301,55500,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71700,,'',0
-'3287',301,64500,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',301,62500,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,71700,,'',0
-'3284',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
-'3287',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3486',301,55500,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71700,,'',0
+'3489',301,64500,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',3101,102500,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71400,,'',0
-'3287',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
+'3489',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,92200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71400,,'',0
+'3486',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71400,,'',0
+'3489',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107162
index abcdfdc5..142b80fa 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107162
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107162
@@ -1,14 +1,14 @@
-'3284',301,55500,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71700,,'',0
-'3287',301,64500,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',301,62500,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3289',301,71700,,'',0
-'3284',2400,145900,0,'Ctr Loop',0
-'3284',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3486',301,55500,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71700,,'',0
+'3489',301,64500,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3486',2400,145900,0,'Ctr Loop',0
'3288',3101,102500,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71400,,'',0
-'3287',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64200,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,81600,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,92200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71400,,'',0
+'3486',1003101,74400,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71400,,'',0
+'3489',1003101,84900,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107163 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107163
index ab6a18b4..43d29e69 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107163
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107163
@@ -1,14 +1,14 @@
-'3284',301,55600,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71800,,'',0
-'3287',301,64600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',301,62600,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0
'3289',301,71800,,'',0
-'3284',2400,150000,0,'Ctr Loop',0
-'3284',3101,64300,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
-'3287',3101,81700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3486',301,55600,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71800,,'',0
+'3489',301,64600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3486',2400,150000,0,'Ctr Loop',0
'3288',3101,102600,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74500,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71500,,'',0
-'3287',1003101,85000,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64300,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38300,,'',0
+'3489',3101,81700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,92300,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71500,,'',0
+'3486',1003101,74500,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71500,,'',0
+'3489',1003101,85000,,'',0,10600,,'',0,14500,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107164 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107164
index 0ca34e32..ef548b46 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107164
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107164
@@ -1,14 +1,14 @@
-'3284',301,55700,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',301,71900,,'',0
-'3287',301,64700,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',301,62700,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,71900,,'',0
-'3284',2400,150100,0,'Ctr Loop',0
-'3284',3101,64300,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
-'3287',3101,81700,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3486',301,55700,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',301,71900,,'',0
+'3489',301,64700,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3486',2400,150100,0,'Ctr Loop',0
'3288',3101,102600,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74600,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71500,,'',0
-'3287',1003101,85000,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64300,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38400,,'',0
+'3489',3101,81700,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
'3288',1003101,92300,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71500,,'',0
+'3486',1003101,74600,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71500,,'',0
+'3489',1003101,85000,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107165 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107165
index d0cc727d..9af37d82 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107165
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107165
@@ -1,19 +1,19 @@
-'3284',300,55000,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3284',301,55700,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',300,62000,,'',0
-'3285',301,71900,,'',0
-'3287',300,55300,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3287',301,64700,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',300,63400,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3288',301,62700,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',300,62000,,'',0
'3289',301,71900,,'',0
-'3284',2400,150200,0,'Ctr Loop',0
-'3284',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
-'3287',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3486',300,55000,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3486',301,55700,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',300,62000,,'',0
+'3487',301,71900,,'',0
+'3489',300,55300,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3489',301,64700,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3486',2400,150200,0,'Ctr Loop',0
'3288',3101,102700,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71600,,'',0
-'3287',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
+'3489',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
'3288',1003101,92400,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71600,,'',0
+'3486',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71600,,'',0
+'3489',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107166 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107166
index 7c50148d..bc096cb7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107166
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107166
@@ -1,19 +1,19 @@
-'3284',300,55000,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3284',301,55800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
-'3285',300,62000,,'',0
-'3285',301,72000,,'',0
-'3287',300,55300,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
-'3287',301,64800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
'3288',300,63400,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3288',301,62800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',300,62000,,'',0
'3289',301,72000,,'',0
-'3284',2400,150200,0,'Ctr Loop',0
-'3284',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
-'3287',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
+'3486',300,55000,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3486',301,55800,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4400,,'',0,8400,,'',0,9900,,'',0
+'3487',300,62000,,'',0
+'3487',301,72000,,'',0
+'3489',300,55300,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3489',301,64800,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0
+'3486',2400,150200,0,'Ctr Loop',0
'3288',3101,102700,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71600,,'',0
-'3287',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64400,,'',0,8500,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,4800,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,11900,,'',0,7900,,'',0,7400,,'',0,3600,,'',0,6600,,'',0,3100,,'',0,1600,,'',0,38300,,'',0
+'3489',3101,81800,,'',0,10300,,'',0,10600,,'',0,11000,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10800,,'',0
'3288',1003101,92400,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,15400,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71600,,'',0
+'3486',1003101,74700,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,15000,,'',0,11700,,'',0,9500,,'',0,3800,,'',0,7500,,'',0,3000,,'',0,6300,,'',0,10500,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71600,,'',0
+'3489',1003101,85100,,'',0,10600,,'',0,14600,,'',0,11100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10700,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107167 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107167
index 193e73e4..1094a22d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107167
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107167
@@ -1,3 +1,3 @@
-'3284',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62600,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,62900,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,2600,,'',0,9400,,'',0
+'3486',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62600,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107168 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107168
index 180b3118..7ce4b105 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107168
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107168
@@ -1,3 +1,3 @@
-'3284',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,62900,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3486',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107169 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107169
index fd7c4bca..4cfe3a46 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107169
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107169
@@ -1,3 +1,3 @@
-'3284',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,63000,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3486',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,2200,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62700,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107170 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107170
index 9cf8da54..639bd503 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107170
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107170
@@ -1,3 +1,3 @@
-'3284',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62800,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
'3288',101,63000,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3486',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5400,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62800,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,2300,,'',0,7500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107171 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107171
index a1350ce2..518aea4c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107171
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107171
@@ -1,3 +1,3 @@
-'3284',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62900,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3288',101,63100,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3486',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5700,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3200,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62900,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3400,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107172 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107172
index a62df8df..baca19a5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107172
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107172
@@ -1,3 +1,3 @@
-'3284',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,63000,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3288',101,63200,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,5400,,'',0
+'3486',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,63000,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107175 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107175
index c9bf83a6..ebb4b775 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107175
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107175
@@ -1,16 +1,16 @@
-'3284',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61300,,'',0
-'3287',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,5900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61300,,'',0
-'3284',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73300,,'',0
-'3287',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61300,,'',0
+'3489',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',500,64000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',500,73300,,'',0
-'3284',1700,64800,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3284',2100,65300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
-'3287',2100,82700,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73300,,'',0
+'3489',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',1700,64800,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3288',2100,95000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143100,0,'Ctr Loop',0
-'3284',1002100,152600,,'',0,9500,,'',0
+'3486',2100,65300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
+'3489',2100,82700,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143100,0,'Ctr Loop',0
+'3486',1002100,152600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107176 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107176
index 1c074c47..a5039364 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107176
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107176
@@ -1,16 +1,16 @@
-'3284',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61300,,'',0
-'3287',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,5900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61300,,'',0
-'3284',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73300,,'',0
-'3287',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61300,,'',0
+'3489',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',500,64000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',500,73300,,'',0
-'3284',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4300,,'',0,7900,,'',0,7600,,'',0
-'3284',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,10900,,'',0
-'3287',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',500,61000,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73300,,'',0
+'3489',500,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4300,,'',0,7900,,'',0,7600,,'',0
'3288',2100,95100,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143100,0,'Ctr Loop',0
-'3284',1002100,152600,,'',0,9500,,'',0
+'3486',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,10900,,'',0
+'3489',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143100,0,'Ctr Loop',0
+'3486',1002100,152600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107177 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107177
index 5fc26dd2..3ad44e75 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107177
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107177
@@ -1,16 +1,16 @@
-'3284',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61300,,'',0
-'3287',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,62800,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61300,,'',0
-'3284',500,61100,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73400,,'',0
-'3287',500,70100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',300,54300,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61300,,'',0
+'3489',300,54700,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',500,64000,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3289',500,73400,,'',0
-'3284',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3284',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,11000,,'',0
-'3287',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',500,61100,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73400,,'',0
+'3489',500,70100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3486',1700,64900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3288',2100,95100,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',2400,143200,0,'Ctr Loop',0
-'3284',1002100,152700,,'',0,9500,,'',0
+'3486',2100,65400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13400,,'',0,20600,,'',0,8800,,'',0,15600,,'',0,11000,,'',0
+'3489',2100,82800,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',2400,143200,0,'Ctr Loop',0
+'3486',1002100,152700,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107178 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107178
index 2a7d3127..d668c4d3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107178
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107178
@@ -1,5 +1,5 @@
-'3284',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61500,,'',0
-'3287',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,63000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61500,,'',0
+'3486',300,54500,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61500,,'',0
+'3489',300,54900,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107179 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107179
index bcccceb4..7aefc238 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107179
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107179
@@ -1,5 +1,5 @@
-'3284',300,54600,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61600,,'',0
-'3287',300,54900,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63000,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61600,,'',0
+'3486',300,54600,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61600,,'',0
+'3489',300,54900,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107180 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107180
index 38e77700..f4e6419a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107180
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107180
@@ -1,5 +1,5 @@
-'3284',300,54600,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,61600,,'',0
-'3287',300,55000,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,63100,,'',0,9900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3289',300,61600,,'',0
+'3486',300,54600,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,61600,,'',0
+'3489',300,55000,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107181 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107181
index 2c99cebc..36035d29 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107181
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107181
@@ -1,5 +1,5 @@
-'3284',300,54700,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61700,,'',0
-'3287',300,55100,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,63200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61700,,'',0
+'3486',300,54700,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61700,,'',0
+'3489',300,55100,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107182 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107182
index 369c76f8..cf147d00 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107182
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107182
@@ -1,5 +1,5 @@
-'3284',300,54800,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61800,,'',0
-'3287',300,55100,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63200,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61800,,'',0
+'3486',300,54800,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61800,,'',0
+'3489',300,55100,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107183 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107183
index 49a5ed03..a6739897 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107183
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107183
@@ -1,5 +1,5 @@
-'3284',300,54800,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,61800,,'',0
-'3287',300,55200,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,63300,,'',0,9900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3289',300,61800,,'',0
+'3486',300,54800,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,61800,,'',0
+'3489',300,55200,,'',0,10000,,'',0,9800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107184 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107184
index 8ce18777..3107cf83 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107184
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107184
@@ -1,5 +1,5 @@
-'3284',300,54900,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61900,,'',0
-'3287',300,55200,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,63300,,'',0,10000,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61900,,'',0
+'3486',300,54900,,'',0,9900,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,7600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61900,,'',0
+'3489',300,55200,,'',0,10000,,'',0,9900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107185 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107185
index fc8b8c5a..f3dde621 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107185
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107185
@@ -1,3 +1,3 @@
-'3284',100,54700,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2900,,'',0,6100,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63500,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63400,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
+'3486',100,54700,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2900,,'',0,6100,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63500,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107186 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107186
index f2cee4ed..72796660 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107186
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107186
@@ -1,4 +1,4 @@
-'3284',100,54800,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63500,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3284',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
+'3486',100,54800,,'',0,8700,,'',0,7200,,'',0,3300,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1400,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107187 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107187
index 1491f170..5e06774c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107187
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107187
@@ -1,4 +1,4 @@
-'3284',100,54800,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3287',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3288',100,63500,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3284',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
+'3486',100,54800,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3489',100,63600,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107188 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107188
index 43adeae1..f1c680fd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107188
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107188
@@ -1,4 +1,4 @@
-'3284',100,54900,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3287',100,63700,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3288',100,63600,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3284',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
+'3486',100,54900,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3489',100,63700,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107189 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107189
index 88ce9595..b9f728c7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107189
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107189
@@ -1,4 +1,4 @@
-'3284',100,55000,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
-'3287',100,63800,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
'3288',100,63700,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7700,,'',0,10100,,'',0,9400,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9400,,'',0,11900,,'',0
-'3284',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
+'3486',100,55000,,'',0,8700,,'',0,7200,,'',0,3400,,'',0,6300,,'',0,1700,,'',0,1500,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,6100,,'',0,1100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,3000,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1800,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,6500,,'',0,2400,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,6900,,'',0,2900,,'',0
+'3489',100,63800,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2100,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7400,,'',0,2800,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107190 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107190
index cd5bbd3f..8a67d636 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107190
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107190
@@ -1,8 +1,8 @@
-'3284',100,55100,4,'',0,8700,4,'',0,7200,4,'',0,3400,4,'',0,6300,4,'',0,1700,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,6100,4,'',0,1200,4,'',0,1000,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2300,4,'',0,1900,4,'',0,600,4,'',0,6600,4,'',0,3000,4,'',0,6000,4,'',0,2100,4,'',0,1800,4,'',0,5900,4,'',0,2700,4,'',0,6300,4,'',0,1900,4,'',0,1800,4,'',0,1500,4,'',0,6300,4,'',0,1900,4,'',0,2000,4,'',0,5700,4,'',0,2700,4,'',0,6500,4,'',0,2400,4,'',0,3200,4,'',0,6700,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0
-'3284',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',100,63900,4,'',0,7000,4,'',0,4200,4,'',0,8500,4,'',0,7300,4,'',0,3100,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3300,4,'',0,7200,4,'',0,3100,4,'',0,7700,4,'',0,7300,4,'',0,3500,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7200,4,'',0,3000,4,'',0,7100,4,'',0,2900,4,'',0,7400,4,'',0,2100,4,'',0,7100,4,'',0,3500,4,'',0,6500,4,'',0,2300,4,'',0,7400,4,'',0,2800,4,'',0
-'3287',101,60500,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',100,63800,4,'',0,7200,4,'',0,4100,4,'',0,8400,4,'',0,8600,4,'',0,8800,4,'',0,5000,4,'',0,7700,4,'',0,10100,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,8900,4,'',0,4900,4,'',0,8900,4,'',0,8800,4,'',0,9400,4,'',0,11900,4,'',0
'3288',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,2800,,'',0,9400,,'',0
-'3284',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
-'3284',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
+'3486',100,55100,4,'',0,8700,4,'',0,7200,4,'',0,3400,4,'',0,6300,4,'',0,1700,4,'',0,1500,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,5800,4,'',0,1800,4,'',0,1800,4,'',0,6100,4,'',0,1200,4,'',0,1000,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2300,4,'',0,1900,4,'',0,600,4,'',0,6600,4,'',0,3000,4,'',0,6000,4,'',0,2100,4,'',0,1800,4,'',0,5900,4,'',0,2700,4,'',0,6300,4,'',0,1900,4,'',0,1800,4,'',0,1500,4,'',0,6300,4,'',0,1900,4,'',0,2000,4,'',0,5700,4,'',0,2700,4,'',0,6500,4,'',0,2400,4,'',0,3200,4,'',0,6700,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0
+'3486',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',100,63900,4,'',0,7000,4,'',0,4200,4,'',0,8500,4,'',0,7300,4,'',0,3100,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3300,4,'',0,7200,4,'',0,3100,4,'',0,7700,4,'',0,7300,4,'',0,3500,4,'',0,7400,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7200,4,'',0,3000,4,'',0,7100,4,'',0,2900,4,'',0,7400,4,'',0,2100,4,'',0,7100,4,'',0,3500,4,'',0,6500,4,'',0,2300,4,'',0,7400,4,'',0,2800,4,'',0
+'3489',101,60500,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107191 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107191
index 1900bc8e..f371e790 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107191
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107191
@@ -1,7 +1,7 @@
-'3284',101,54500,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3287',101,61900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62300,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3287',701,73900,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54500,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
+'3489',101,61900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3287',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3489',701,73900,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,74000,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3489',1000701,63900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107192 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107192
index e25763f8..80c3828f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107192
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107192
@@ -1,7 +1,7 @@
-'3284',100,53800,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62500,,'',0,3200,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3287',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',100,53800,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',700,60200,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3489',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',1000700,70200,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107193 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107193
index 11853296..96abc782 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107193
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107193
@@ -1,7 +1,7 @@
-'3284',100,53800,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62600,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3287',700,70300,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',100,53800,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62600,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',700,60300,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',1000700,60300,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3489',700,70300,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',1000700,70300,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60300,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107194 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107194
index ef463584..44e80012 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107194
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107194
@@ -1,7 +1,7 @@
-'3284',100,54000,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62700,,'',0,3200,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3287',700,70400,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',100,54000,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2200,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62800,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',700,60400,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',1000700,60400,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3489',700,70400,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',1000700,70400,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60400,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107195 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107195
index d15ae2ec..131f1abd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107195
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107195
@@ -1,4 +1,4 @@
-'3284',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,60600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',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
+'3486',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,60600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107196 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107196
index 3e97aced..fbfa4479 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107196
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107196
@@ -1,4 +1,4 @@
-'3284',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,60700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',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
+'3486',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,60700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107197 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107197
index 9dc157d2..c662865e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107197
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107197
@@ -1,4 +1,4 @@
-'3284',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,60800,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,2800,,'',0,9400,,'',0
-'3284',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
+'3486',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,60800,,'',0,4000,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107198 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107198
index 2569bda4..8132595b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107198
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107198
@@ -1,4 +1,4 @@
-'3284',101,53500,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,60900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61400,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',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
+'3486',101,53500,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,60900,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107199 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107199
index 115bc556..131386ea 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107199
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107199
@@ -1,7 +1,7 @@
-'3284',100,53700,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62400,,'',0,3200,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3287',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',100,53700,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62500,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',700,60200,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3489',700,70200,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',1000700,70200,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60200,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107200 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107200
index 412da498..3362eaf6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107200
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107200
@@ -1,7 +1,7 @@
-'3284',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62000,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3287',701,73600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61600,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63500,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3287',1000701,63600,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3489',701,73600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73700,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3489',1000701,63600,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107201 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107201
index ae576054..4e530520 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107201
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107201
@@ -1,7 +1,7 @@
-'3284',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62100,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3287',701,73700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61700,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3287',1000701,63700,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3489',701,73700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73800,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3489',1000701,63700,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107202 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107202
index ddbc3bc7..12ef8bc9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107202
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107202
@@ -1,7 +1,7 @@
-'3284',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62100,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3287',701,73800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3287',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3489',701,73800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,25500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73900,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3489',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107203 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107203
index c5495980..5eb4c5ec 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107203
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107203
@@ -1,7 +1,7 @@
-'3284',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62200,,'',0,8000,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3287',701,73800,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20100,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'3287',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
+'3489',701,73800,,'',0,18600,,'',0,21500,,'',0,20700,,'',0,25500,,'',0,20800,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73900,,'',0,19700,,'',0,19500,,'',0,20200,,'',0,20100,,'',0,19900,,'',0
+'3489',1000701,63800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21200,,'',0,25400,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107204 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107204
index e5cfac96..cf508f93 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107204
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107204
@@ -1,5 +1,5 @@
-'3284',301,60100,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,72300,,'',0
-'3287',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',301,63100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72300,,'',0
+'3486',301,60100,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,72300,,'',0
+'3489',301,65100,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107205 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107205
index 2b2a5771..d6b22679 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107205
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107205
@@ -1,5 +1,5 @@
-'3284',301,60200,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,72400,,'',0
-'3287',301,65200,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',301,63200,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72400,,'',0
+'3486',301,60200,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7700,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,72400,,'',0
+'3489',301,65200,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107206 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107206
index 81d3519b..7edba759 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107206
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107206
@@ -1,5 +1,5 @@
-'3284',301,60200,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72500,,'',0
-'3287',301,65300,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63200,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,72500,,'',0
+'3486',301,60200,,'',0,5300,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72500,,'',0
+'3489',301,65300,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107207 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107207
index a11f4112..be8fee42 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107207
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107207
@@ -1,5 +1,5 @@
-'3284',301,60300,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,72500,,'',0
-'3287',301,65300,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',301,63300,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,72500,,'',0
+'3486',301,60300,,'',0,5200,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,72500,,'',0
+'3489',301,65300,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107208 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107208
index 6fafd106..01cd3fc4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107208
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107208
@@ -1,8 +1,8 @@
-'3284',301,60300,,'',0,5300,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72600,,'',0
-'3287',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63300,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,72600,,'',0
-'3284',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',301,60300,,'',0,5300,,'',0,10300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7600,,'',0,3600,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72600,,'',0
+'3489',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3486',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107209 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107209
index 5a27ea00..02d592ba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107209
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107209
@@ -1,3 +1,3 @@
-'3284',601,61100,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,61900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61500,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3486',601,61100,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,61900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107210 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107210
index 629376b0..00857c21 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107210
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107210
@@ -1,8 +1,8 @@
-'3284',301,60500,,'',0,5300,,'',0,14300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72800,,'',0
-'3287',301,65600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63500,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72800,,'',0
-'3284',601,61200,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,62000,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',301,60500,,'',0,5300,,'',0,14300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72800,,'',0
+'3489',301,65600,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
+'3486',601,61200,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,62000,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107211 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107211
index 73e5eb30..1fcd9292 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107211
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107211
@@ -1,5 +1,5 @@
-'3284',300,54400,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',300,61400,,'',0
-'3287',300,54800,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',300,62900,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,8900,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,9600,,'',0,9600,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',300,61400,,'',0
+'3486',300,54400,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',300,61400,,'',0
+'3489',300,54800,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107213 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107213
index 08ed0deb..575b855c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107213
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107213
@@ -1,11 +1,11 @@
-'3284',301,60800,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',301,73100,,'',0
-'3287',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63800,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',301,73100,,'',0
-'3284',501,64000,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',501,61100,,'',0
-'3287',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3486',301,60800,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',301,73100,,'',0
+'3489',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',501,62600,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,61100,,'',0
-'3284',2400,142900,0,'Ctr Loop',0
+'3486',501,64000,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',501,61100,,'',0
+'3489',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3486',2400,142900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107214 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107214
index 3c14ff5d..72d2cb78 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107214
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107214
@@ -1,21 +1,21 @@
-'3284',300,54200,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3284',301,60900,4,'',0,9300,4,'',0,10400,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,3500,4,'',0,7600,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3900,4,'',0,7500,4,'',0,3600,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,2900,4,'',0,7200,4,'',0,3500,4,'',0,6900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
-'3285',300,61200,,'',0
-'3285',301,73200,4,'',0
-'3287',300,54600,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
-'3287',301,70000,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3600,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,2800,4,'',0,6900,4,'',0,3000,4,'',0,9400,4,'',0,9400,4,'',0
'3288',300,62700,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3288',301,63900,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,9200,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,5100,4,'',0,9000,4,'',0,9900,4,'',0
'3289',300,61200,,'',0
'3289',301,73200,4,'',0
-'3284',500,60900,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3284',501,64100,4,'',0,7000,4,'',0,2800,4,'',0,7400,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,3500,4,'',0,7300,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3100,4,'',0,8600,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
-'3285',500,73200,,'',0
-'3285',501,61200,4,'',0
-'3287',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
-'3287',501,64600,4,'',0,9800,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,9600,4,'',0,9500,4,'',0,9100,4,'',0
+'3486',300,54200,,'',0,9900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3486',301,60900,4,'',0,9300,4,'',0,10400,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,3500,4,'',0,7600,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3900,4,'',0,7500,4,'',0,3600,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,2900,4,'',0,7200,4,'',0,3500,4,'',0,6900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
+'3487',300,61200,,'',0
+'3487',301,73200,4,'',0
+'3489',300,54600,,'',0,10000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
+'3489',301,70000,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,3600,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,2800,4,'',0,6900,4,'',0,3000,4,'',0,9400,4,'',0,9400,4,'',0
'3288',500,63900,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3288',501,62700,4,'',0,9900,4,'',0,9800,4,'',0,9800,4,'',0,9900,4,'',0,8900,4,'',0,4900,4,'',0,9900,4,'',0,9000,4,'',0,9000,4,'',0,9600,4,'',0,9700,4,'',0,9100,4,'',0,10100,4,'',0,10200,4,'',0
'3289',500,73200,,'',0
'3289',501,61200,4,'',0
-'3284',2400,143000,0,'Ctr Loop',0
+'3486',500,60900,,'',0,9300,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3486',501,64100,4,'',0,7000,4,'',0,2800,4,'',0,7400,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,3500,4,'',0,7300,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3100,4,'',0,8600,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
+'3487',500,73200,,'',0
+'3487',501,61200,4,'',0
+'3489',500,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0
+'3489',501,64600,4,'',0,9800,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,9600,4,'',0,9500,4,'',0,9100,4,'',0
+'3486',2400,143000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107215 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107215
index 4bfc53f0..cadec18e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107215
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107215
@@ -1,14 +1,14 @@
-'3284',401,60100,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3287',401,60500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',401,65000,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61600,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3287',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3284',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90700,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',401,60100,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3489',401,60500,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61600,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3489',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3288',3100,112100,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72600,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90700,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,83000,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62800,,'',0,3000,,'',0
-'3285',24003100,55900,,'',0
+'3486',1003100,64100,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,83000,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55900,,'',0
+'3486',24003100,62800,,'',0,3000,,'',0
+'3487',24003100,55900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107216 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107216
index 2714ec17..d4040df1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107216
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107216
@@ -1,5 +1,5 @@
-'3284',401,60100,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',401,65100,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61600,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3287',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60100,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61600,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
+'3489',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107217 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107217
index bde4e959..ec85fa06 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107217
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107217
@@ -1,5 +1,5 @@
-'3284',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3287',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65100,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61700,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3287',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60200,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3489',401,60600,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61700,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3489',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107218 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107218
index 572db159..af237c90 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107218
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107218
@@ -1,5 +1,5 @@
-'3284',401,60200,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',401,65200,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3287',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60200,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
+'3489',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107219 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107219
index 78ba3b96..977cadb6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107219
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107219
@@ -1,5 +1,5 @@
-'3284',401,60300,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3287',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65200,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3287',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60300,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3489',401,60700,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61700,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3489',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107220 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107220
index 0c221c69..ba3824ee 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107220
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107220
@@ -1,5 +1,5 @@
-'3284',401,60300,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65300,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
-'3287',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60300,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,60800,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61800,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,4900,,'',0
+'3489',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107221 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107221
index b96fff01..b245669e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107221
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107221
@@ -1,5 +1,5 @@
-'3284',401,60400,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',401,65400,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',1501,61900,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3287',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',401,60400,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
+'3486',1501,61900,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3489',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107222 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107222
index 1744f984..2dd13d83 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107222
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107222
@@ -1,6 +1,6 @@
-'3284',401,60500,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3287',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65400,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',2601,143400,,'',0
-'3285',2601,75300,,'',0
+'3486',401,60500,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3489',401,60900,,'',0,5000,,'',0,10000,,'',0,14100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2601,75300,,'',0
+'3486',2601,143400,,'',0
+'3487',2601,75300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107223 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107223
index 7973be60..e9192802 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107223
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107223
@@ -1,6 +1,6 @@
-'3284',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65500,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',2601,143500,,'',0
-'3285',2601,75400,,'',0
+'3486',401,60500,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2601,75400,,'',0
+'3486',2601,143500,,'',0
+'3487',2601,75400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107224 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107224
index a9ff2eac..f6302060 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107224
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107224
@@ -1,3 +1,3 @@
-'3284',401,60500,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65500,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60500,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107225 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107225
index 46583ffc..9a14f1dd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107225
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107225
@@ -1,3 +1,3 @@
-'3284',401,60600,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65600,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60600,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107226 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107226
index da02a401..401cd784 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107226
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107226
@@ -1,3 +1,3 @@
-'3284',401,60700,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65700,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60700,,'',0,10100,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107227 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107227
index 1bc6652c..6454de56 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107227
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107227
@@ -1,3 +1,3 @@
-'3284',401,60700,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65700,,'',0,20100,,'',0,17000,,'',0,13100,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60700,,'',0,10100,,'',0,2500,,'',0,2600,,'',0,15400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107228 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107228
index fbb93c88..5c6385ad 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107228
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107228
@@ -1,6 +1,6 @@
-'3284',401,60800,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65800,,'',0,20100,,'',0,17000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3284',2601,143800,,'',0
-'3285',2601,75700,,'',0
+'3486',401,60800,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2601,75700,,'',0
+'3486',2601,143800,,'',0
+'3487',2601,75700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107229 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107229
index 2f83b54d..78e7a350 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107229
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107229
@@ -1,3 +1,3 @@
-'3284',401,60900,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65900,,'',0,24100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60900,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107230 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107230
index 76351f0b..83d52d10 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107230
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107230
@@ -1,3 +1,3 @@
-'3284',401,60900,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,65900,,'',0,24100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,60900,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107231 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107231
index 034999ab..dc42b9b1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107231
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107231
@@ -1,3 +1,3 @@
-'3284',401,61000,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,70000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,61000,,'',0,10100,,'',0,2500,,'',0,6500,,'',0,11500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107232 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107232
index 64ab5f2b..2adf01e9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107232
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107232
@@ -1,3 +1,3 @@
-'3284',401,61000,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
-'3287',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',401,70000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',401,61000,,'',0,10100,,'',0,2500,,'',0,6600,,'',0,11400,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,12400,,'',0
+'3489',401,61500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107234 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107234
index c43dbd8a..bfac53e7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107234
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107234
@@ -1,3 +1,3 @@
-'3284',400,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107235 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107235
index c7f60599..6f4469e7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107235
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107235
@@ -1,3 +1,3 @@
-'3284',400,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70200,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107236 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107236
index 0caf3413..8b33dcc9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107236
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107236
@@ -1,3 +1,3 @@
-'3284',400,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70200,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61200,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61700,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107237 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107237
index acab94b1..172836a5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107237
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107237
@@ -1,3 +1,3 @@
-'3284',400,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107238 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107238
index 58732ab6..57813e95 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107238
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107238
@@ -1,3 +1,3 @@
-'3284',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107239 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107239
index 58732ab6..57813e95 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107239
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107239
@@ -1,3 +1,3 @@
-'3284',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70500,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61500,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62000,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107240 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107240
index cae95b24..3d5785bd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107240
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107240
@@ -1,3 +1,3 @@
-'3284',400,61600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70600,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61600,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62100,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107241 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107241
index 30864de5..c425518a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107241
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107241
@@ -1,3 +1,3 @@
-'3284',400,61700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70700,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61700,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62200,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107242 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107242
index aba43fca..3fe9a3a9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107242
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107242
@@ -1,3 +1,3 @@
-'3284',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70800,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3486',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107243 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107243
index aba43fca..3fe9a3a9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107243
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107243
@@ -1,3 +1,3 @@
-'3284',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70800,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3486',400,61800,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62300,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107244 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107244
index 527f7903..399639dd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107244
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107244
@@ -1,3 +1,3 @@
-'3284',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70900,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3486',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107245 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107245
index 527f7903..399639dd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107245
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107245
@@ -1,3 +1,3 @@
-'3284',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70900,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3486',400,61900,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62400,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107246 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107246
index 822b53a7..f5631584 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107246
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107246
@@ -1,3 +1,3 @@
-'3284',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,71000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
+'3486',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107247 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107247
index cb2545a4..60faaeb0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107247
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107247
@@ -1,6 +1,6 @@
-'3284',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,71000,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3284',2600,144600,0,'Montrose Exch Only',0
-'3285',2600,80400,,'',0
+'3486',400,62000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62500,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2600,80400,,'',0
+'3486',2600,144600,0,'Montrose Exch Only',0
+'3487',2600,80400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107248 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107248
index 3dd3b677..cf31739d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107248
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107248
@@ -1,6 +1,6 @@
-'3284',400,62100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,71100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3284',2600,144700,0,'Montrose Exch Only',0
-'3285',2600,80500,,'',0
+'3486',400,62100,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2600,80500,,'',0
+'3486',2600,144700,0,'Montrose Exch Only',0
+'3487',2600,80500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107249 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107249
index b0e70f5f..c858becb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107249
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107249
@@ -1,5 +1,5 @@
-'3284',400,62300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,71300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,13000,,'',0
-'3284',1500,64600,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,93100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',400,62300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3486',1500,64600,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,93100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107250 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107250
index 69f18bbe..507b70b5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107250
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107250
@@ -1,5 +1,5 @@
-'3284',400,62300,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62800,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3288',400,71300,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',1500,64600,,'',0,8600,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',400,62300,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62800,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3486',1500,64600,,'',0,8600,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107251 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107251
index 2ab95918..014a8f64 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107251
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107251
@@ -1,5 +1,5 @@
-'3284',400,62400,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,62900,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,5900,,'',0
'3288',400,71400,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',1500,64700,,'',0,8500,,'',0,12200,,'',0,68200,,'',0,20600,,'',0,8700,,'',0
-'3287',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',400,62400,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,62900,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,5900,,'',0
+'3486',1500,64700,,'',0,8500,,'',0,12200,,'',0,68200,,'',0,20600,,'',0,8700,,'',0
+'3489',1500,93200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107252 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107252
index fa50353c..a358845f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107252
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107252
@@ -1,5 +1,5 @@
-'3284',400,62500,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
'3288',400,71500,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',1500,64800,,'',0,8500,,'',0,12300,,'',0,68100,,'',0,20600,,'',0,8700,,'',0
-'3287',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',400,62500,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
+'3486',1500,64800,,'',0,8500,,'',0,12300,,'',0,68100,,'',0,20600,,'',0,8700,,'',0
+'3489',1500,93300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107253 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107253
index 2561e8df..4966b03b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107253
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107253
@@ -1,5 +1,5 @@
-'3284',400,62500,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
'3288',400,71500,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',1500,64800,,'',0,8600,,'',0,12200,,'',0,68100,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',400,62500,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,63000,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
+'3486',1500,64800,,'',0,8600,,'',0,12200,,'',0,68100,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107254 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107254
index b5112220..53def0d7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107254
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107254
@@ -1,13 +1,13 @@
-'3284',400,62600,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,63100,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
'3288',400,71600,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',1500,64900,,'',0,8500,,'',0,12300,,'',0,68100,,'',0,20600,,'',0,8700,,'',0
-'3287',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',3101,64000,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,81400,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
+'3486',400,62600,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,3500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,63100,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,14400,,'',0,9900,,'',0
+'3486',1500,64900,,'',0,8500,,'',0,12300,,'',0,68100,,'',0,20600,,'',0,8700,,'',0
+'3489',1500,93400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3288',3101,102300,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71200,,'',0
-'3287',1003101,84700,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,64000,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,81400,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,92000,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71200,,'',0
+'3486',1003101,74200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71200,,'',0
+'3489',1003101,84700,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107255 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107255
index 2c96246b..0bcfb414 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107255
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107255
@@ -1,8 +1,8 @@
-'3284',3101,63900,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,81300,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',3101,102200,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,74100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,71100,,'',0
-'3287',1003101,84600,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,63900,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,81300,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,91900,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,71100,,'',0
+'3486',1003101,74100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10600,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,71100,,'',0
+'3489',1003101,84600,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14800,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107256 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107256
index 3b2afa38..fcfe526b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107256
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107256
@@ -1,8 +1,8 @@
-'3284',3101,63800,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,81200,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',3101,102100,,'',0,21900,,'',0,11000,,'',0,15400,,'',0,11500,,'',0,11000,,'',0
-'3284',1003101,73900,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10700,,'',0,8500,,'',0,12200,,'',0
-'3285',1003101,70900,,'',0
-'3287',1003101,84500,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,63800,,'',0,8500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,4800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11100,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,6600,,'',0,3100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,81200,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,91800,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,70900,,'',0
+'3486',1003101,73900,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,9500,,'',0,3800,,'',0,7600,,'',0,3000,,'',0,6300,,'',0,10700,,'',0,8500,,'',0,12200,,'',0
+'3487',1003101,70900,,'',0
+'3489',1003101,84500,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107257 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107257
index 53fa18d1..e0611b89 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107257
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107257
@@ -1,9 +1,9 @@
-'3284',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63200,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3287',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
+'3486',201,52700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1400,,'',0,1000,0,'Bourquin Exch Only',0,1300,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,61700,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,71800,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3287',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3489',400,63300,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,9900,,'',0,10400,,'',0,9900,,'',0
'3288',901,70400,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3285',2600,81900,,'',0
+'3489',901,71400,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81900,,'',0
+'3487',2600,81900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107258 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107258
index a81f70b9..9a44d68c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107258
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107258
@@ -1,6 +1,6 @@
-'3284',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60400,,'',0
-'3287',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',501,61900,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60400,,'',0
-'3284',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
+'3486',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60400,,'',0
+'3489',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107259 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107259
index 8610546b..cf9eb963 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107259
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107259
@@ -1,6 +1,6 @@
-'3284',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60400,,'',0
-'3287',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',501,61900,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60400,,'',0
-'3284',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
+'3486',501,63200,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60400,,'',0
+'3489',501,63800,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107260 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107260
index 6b96264e..d7fad9dc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107260
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107260
@@ -1,5 +1,5 @@
-'3284',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60500,,'',0
-'3287',501,63800,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,61900,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60500,,'',0
+'3486',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60500,,'',0
+'3489',501,63800,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107261 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107261
index a5773857..3b1df523 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107261
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107261
@@ -1,5 +1,5 @@
-'3284',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60500,,'',0
-'3287',501,63900,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',501,62000,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60500,,'',0
+'3486',501,63300,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60500,,'',0
+'3489',501,63900,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107262 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107262
index bf16b2f1..00aab79d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107262
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107262
@@ -1,5 +1,5 @@
-'3284',501,63400,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60600,,'',0
-'3287',501,63900,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62000,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60600,,'',0
+'3486',501,63400,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60600,,'',0
+'3489',501,63900,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107263 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107263
index 5923df43..8044b1fe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107263
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107263
@@ -1,5 +1,5 @@
-'3284',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60700,,'',0
-'3287',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62100,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60700,,'',0
+'3486',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60700,,'',0
+'3489',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107264 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107264
index 89ae8747..4532a8ca 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107264
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107264
@@ -1,5 +1,5 @@
-'3284',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60700,,'',0
-'3287',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62100,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60700,,'',0
+'3486',501,63500,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60700,,'',0
+'3489',501,64000,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107265 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107265
index 38212369..99d926a0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107265
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107265
@@ -1,5 +1,5 @@
-'3284',501,63600,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60800,,'',0
-'3287',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60800,,'',0
+'3486',501,63600,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60800,,'',0
+'3489',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107267 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107267
index 562a6b09..d6ed258a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107267
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107267
@@ -1,5 +1,5 @@
-'3284',501,63700,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60800,,'',0
-'3287',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62300,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60800,,'',0
+'3486',501,63700,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60800,,'',0
+'3489',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107268 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107268
index 44cc8703..5e680891 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107268
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107268
@@ -1,5 +1,5 @@
-'3284',501,63700,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60900,,'',0
-'3287',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62300,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60900,,'',0
+'3486',501,63700,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60900,,'',0
+'3489',501,64200,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107270 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107270
index 547719af..91d67c34 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107270
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107270
@@ -1,5 +1,5 @@
-'3284',501,63900,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,61000,,'',0
-'3287',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62500,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,61000,,'',0
+'3486',501,63900,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,61000,,'',0
+'3489',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107271 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107271
index e7f608b4..5c0b4ee5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107271
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107271
@@ -1,5 +1,5 @@
-'3284',501,63900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',501,61000,,'',0
-'3287',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62500,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,61000,,'',0
+'3486',501,63900,,'',0,7000,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',501,61000,,'',0
+'3489',501,64400,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107272 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107272
index 9d706339..b04fd149 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107272
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107272
@@ -1,5 +1,5 @@
-'3284',501,64000,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,61100,,'',0
-'3287',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62600,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8800,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,61100,,'',0
+'3486',501,64000,,'',0,6900,,'',0,2800,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3100,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,61100,,'',0
+'3489',501,64500,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107273 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107273
index b5bfa690..4536e09b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107273
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107273
@@ -1,9 +1,9 @@
-'3284',601,61400,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,62200,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3284',1701,63200,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60400,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',601,61400,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,62200,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',1701,63200,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90500,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',2401,80100,0,'Ctr Loop',0
-'3284',1002101,72400,,'',0
+'3486',2101,60400,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',2401,80100,0,'Ctr Loop',0
+'3486',1002101,72400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107274 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107274
index 4a8cad0d..c3fff83d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107274
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107274
@@ -1,9 +1,9 @@
-'3284',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',1701,63300,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74300,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',1701,63300,,'',0,7200,,'',0,4800,,'',0,76600,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90500,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',2401,80200,0,'Ctr Loop',0
-'3284',1002101,72500,,'',0
+'3486',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74300,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',2401,80200,0,'Ctr Loop',0
+'3486',1002101,72500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107275 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107275
index 1d233070..ed65f876 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107275
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107275
@@ -1,5 +1,5 @@
-'3284',1701,63300,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,4100,,'',0,9600,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74400,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1701,63300,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90600,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,72500,,'',0
+'3486',2101,60500,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,4100,,'',0,9600,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74400,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1002101,72500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107276 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107276
index 3cde3c9e..db0deebb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107276
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107276
@@ -1,5 +1,5 @@
-'3284',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
-'3284',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
-'3287',2100,82600,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,4400,,'',0,7800,,'',0,7600,,'',0
'3288',2100,94900,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,152500,,'',0,9500,,'',0
+'3486',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16600,,'',0,13300,,'',0,20600,,'',0,8900,,'',0,15600,,'',0,11000,,'',0
+'3489',2100,82600,,'',0,20200,,'',0,11900,,'',0,19200,,'',0,16400,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,152500,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107277 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107277
index dc443bcc..71893cc3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107277
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107277
@@ -1,4 +1,4 @@
-'3284',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3284',2401,80300,0,'Ctr Loop',0
+'3486',601,61500,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62300,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,80300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107278 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107278
index 52d0aa31..eec9a9ef 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107278
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107278
@@ -1,4 +1,4 @@
-'3284',601,61600,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62400,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
-'3284',2401,80400,0,'Ctr Loop',0
+'3486',601,61600,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62400,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,80400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107279 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107279
index 2873dbd0..db1d4f39 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107279
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107279
@@ -1,5 +1,5 @@
-'3284',500,61200,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73600,,'',0
-'3287',500,70300,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
'3288',500,64200,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',500,73600,,'',0
+'3486',500,61200,,'',0,9300,,'',0,10500,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73600,,'',0
+'3489',500,70300,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107280 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107280
index 9eed82a9..83ae94e8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107280
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107280
@@ -1,5 +1,5 @@
-'3284',500,61300,,'',0,9300,,'',0,10500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73600,,'',0
-'3287',500,70300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
'3288',500,64200,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3289',500,73600,,'',0
+'3486',500,61300,,'',0,9300,,'',0,10500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73600,,'',0
+'3489',500,70300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,3000,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107282 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107282
index 086895ec..449d0550 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107282
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107282
@@ -1,5 +1,5 @@
-'3284',500,61400,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73900,,'',0
-'3287',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64400,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',500,73900,,'',0
+'3486',500,61400,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73900,,'',0
+'3489',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107283 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107283
index 701232bb..46e528bd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107283
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107283
@@ -1,5 +1,5 @@
-'3284',500,61600,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74000,,'',0
-'3287',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64500,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74000,,'',0
+'3486',500,61600,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74000,,'',0
+'3489',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107284 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107284
index 80ab9a3b..a9f977c2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107284
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107284
@@ -1,5 +1,5 @@
-'3284',500,61600,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74100,,'',0
-'3287',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64500,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74100,,'',0
+'3486',500,61600,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74100,,'',0
+'3489',500,70600,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107285 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107285
index 1eb44e44..b33c6a4c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107285
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107285
@@ -1,5 +1,5 @@
-'3284',500,61700,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74200,,'',0
-'3287',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64600,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74200,,'',0
+'3486',500,61700,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74200,,'',0
+'3489',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107286 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107286
index 4fd3049e..9459fe89 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107286
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107286
@@ -1,6 +1,6 @@
-'3284',500,61800,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74300,,'',0
-'3287',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64700,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74300,,'',0
-'3284',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
+'3486',500,61800,,'',0,9300,,'',0,10800,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74300,,'',0
+'3489',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107287 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107287
index d8c2e70d..f939b17c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107287
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107287
@@ -1,6 +1,6 @@
-'3284',500,61900,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,74400,,'',0
-'3287',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64800,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9100,,'',0,4900,,'',0,9900,,'',0
'3289',500,74400,,'',0
-'3284',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
+'3486',500,61900,,'',0,9300,,'',0,10700,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7500,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,74400,,'',0
+'3489',500,70900,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107288 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107288
index aac46a01..6674970f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107288
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107288
@@ -1,4 +1,4 @@
-'3284',601,55800,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3288',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74000,0,'Ctr Loop',0
+'3486',601,55800,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,74000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107289 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107289
index bbf22f72..56c0f05d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107289
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107289
@@ -1,4 +1,4 @@
-'3284',601,55800,,'',0,8100,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,15500,,'',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
-'3287',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3288',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74000,0,'Ctr Loop',0
+'3486',601,55800,,'',0,8100,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,15500,,'',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
+'3489',601,60700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,74000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107290 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107290
index aa385dd5..bb235422 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107290
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107290
@@ -1,4 +1,4 @@
-'3284',601,55900,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74100,0,'Ctr Loop',0
+'3486',601,55900,,'',0,8100,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107291 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107291
index 707423a5..636b8037 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107291
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107291
@@ -1,4 +1,4 @@
-'3284',601,55900,,'',0,8100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74200,0,'Ctr Loop',0
+'3486',601,55900,,'',0,8100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,60800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74200,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107292 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107292
index 04402e5f..38a2c8ce 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107292
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107292
@@ -1,4 +1,4 @@
-'3284',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74300,0,'Ctr Loop',0
+'3486',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107293 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107293
index 04402e5f..38a2c8ce 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107293
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107293
@@ -1,4 +1,4 @@
-'3284',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74300,0,'Ctr Loop',0
+'3486',601,60000,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,60900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107294 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107294
index 4ae31394..79388f2b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107294
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107294
@@ -1,4 +1,4 @@
-'3284',601,60100,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61000,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74400,0,'Ctr Loop',0
+'3486',601,60100,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61000,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107295 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107295
index 7ef1f523..175707a2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107295
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107295
@@ -1,4 +1,4 @@
-'3284',601,60200,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74500,0,'Ctr Loop',0
+'3486',601,60200,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107296 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107296
index aaa512cd..8df7cd6d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107296
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107296
@@ -1,4 +1,4 @@
-'3284',601,60300,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61100,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
'3288',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,74700,0,'Ctr Loop',0
+'3486',601,60300,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61100,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,14500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107297 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107297
index 7e2f8012..86209d38 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107297
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107297
@@ -1,4 +1,4 @@
-'3284',601,60300,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10400,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
'3288',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74700,0,'Ctr Loop',0
+'3486',601,60300,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10400,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107298 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107298
index 429f80ea..3e6ed093 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107298
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107298
@@ -1,4 +1,4 @@
-'3284',601,60400,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61200,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
'3288',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,74800,0,'Ctr Loop',0
+'3486',601,60400,,'',0,4100,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61200,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14500,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,5500,,'',0
+'3486',2401,74800,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107299 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107299
index e7a8d1fe..45ef0038 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107299
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107299
@@ -1,4 +1,4 @@
-'3284',601,60400,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
'3288',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2401,74900,0,'Ctr Loop',0
+'3486',601,60400,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,74900,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107300 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107300
index e9855baa..fdfb07dc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107300
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107300
@@ -1,4 +1,4 @@
-'3284',601,60500,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61300,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75000,0,'Ctr Loop',0
+'3486',601,60500,,'',0,4100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61300,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107301 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107301
index 783810d0..687b5341 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107301
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107301
@@ -1,4 +1,4 @@
-'3284',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75100,0,'Ctr Loop',0
+'3486',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107302 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107302
index 783810d0..687b5341 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107302
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107302
@@ -1,4 +1,4 @@
-'3284',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75100,0,'Ctr Loop',0
+'3486',601,60600,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61400,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75100,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107303 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107303
index 871e96f9..7da0ad8d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107303
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107303
@@ -1,4 +1,4 @@
-'3284',601,60700,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75200,0,'Ctr Loop',0
+'3486',601,60700,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,14400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75200,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107304 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107304
index e36afb9d..0ac63e10 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107304
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107304
@@ -1,4 +1,4 @@
-'3284',601,60700,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3284',2401,75300,0,'Ctr Loop',0
+'3486',601,60700,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61500,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107305 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107305
index 5b22682e..1d867dc4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107305
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107305
@@ -1,4 +1,4 @@
-'3284',601,60800,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61600,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75300,0,'Ctr Loop',0
+'3486',601,60800,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61600,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107306 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107306
index 849898a7..dbe29a0f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107306
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107306
@@ -1,4 +1,4 @@
-'3284',601,60900,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15900,,'',0
-'3284',2401,75400,0,'Ctr Loop',0
+'3486',601,60900,,'',0,4100,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,15000,,'',0,10400,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75400,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107307 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107307
index f794ebd4..c970d553 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107307
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107307
@@ -1,4 +1,4 @@
-'3284',601,60900,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3284',2401,75500,0,'Ctr Loop',0
+'3486',601,60900,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61700,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,75500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107308 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107308
index e5b2ad36..038aff08 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107308
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107308
@@ -1,7 +1,7 @@
-'3284',601,61000,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61800,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3284',2201,151900,,'',0
-'3285',2201,82600,,'',0
+'3486',601,61000,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61800,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3289',2201,85600,,'',0
-'3284',2401,75600,0,'Ctr Loop',0
+'3486',2201,151900,,'',0
+'3487',2201,82600,,'',0
+'3486',2401,75600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107309 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107309
index e00fa050..4632d2a1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107309
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107309
@@ -1,7 +1,7 @@
-'3284',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
-'3287',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5500,,'',0,8900,,'',0,9500,,'',0,11500,,'',0,15800,,'',0
-'3284',2201,152000,,'',0
-'3285',2201,82700,,'',0
+'3486',601,61100,,'',0,4200,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,15500,,'',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
+'3489',601,61900,,'',0,12200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10300,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3289',2201,85700,,'',0
-'3284',2401,75700,0,'Ctr Loop',0
+'3486',2201,152000,,'',0
+'3487',2201,82700,,'',0
+'3486',2401,75700,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107310 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107310
index 3e43d411..b73cd44a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107310
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107310
@@ -1,4 +1,4 @@
-'3284',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',2401,80500,0,'Ctr Loop',0
+'3486',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,80500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107311 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107311
index 3e43d411..b73cd44a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107311
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107311
@@ -1,4 +1,4 @@
-'3284',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',2401,80500,0,'Ctr Loop',0
+'3486',601,61700,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62500,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,80500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107312 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107312
index f6400320..0c0c1dbe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107312
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107312
@@ -1,4 +1,4 @@
-'3284',601,61800,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62600,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
-'3284',2401,80600,0,'Ctr Loop',0
+'3486',601,61800,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62600,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',2401,80600,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107313 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107313
index 4a3a9eaf..e52d04c4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107313
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107313
@@ -1,3 +1,3 @@
-'3284',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3486',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107314 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107314
index 0024696d..fd34f91e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107314
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107314
@@ -1,3 +1,3 @@
-'3284',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3486',601,61900,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62700,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,14500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107315 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107315
index 61b474a9..c0472964 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107315
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107315
@@ -1,3 +1,3 @@
-'3284',601,61900,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62700,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
'3288',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3486',601,61900,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62700,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107316 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107316
index 72089937..d7d493b5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107316
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107316
@@ -1,3 +1,3 @@
-'3284',601,62000,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
-'3287',601,62800,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
'3288',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3486',601,62000,,'',0,8400,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11600,,'',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
+'3489',601,62800,,'',0,12200,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,14600,,'',0,10500,,'',0,10900,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107317 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107317
index a6aa726b..fe8e549b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107317
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107317
@@ -1,3 +1,3 @@
-'3284',601,62100,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
-'3287',601,62900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
'3288',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11700,,'',0
+'3486',601,62100,,'',0,8300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11700,,'',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
+'3489',601,62900,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10800,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107318 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107318
index 2b1b6a6b..16cb211e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107318
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107318
@@ -1,7 +1,7 @@
-'3284',700,62100,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70700,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,60700,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3284',1600,73600,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3284',1000700,73600,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60700,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',700,62100,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70700,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73600,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
'3288',1000700,70700,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73600,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60700,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107319 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107319
index fcd2bec0..1b4e9e36 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107319
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107319
@@ -1,7 +1,7 @@
-'3284',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70800,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,60800,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3284',1600,73700,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3284',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70800,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73700,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
'3288',1000700,70800,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107320 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107320
index 30d478ab..837a6f15 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107320
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107320
@@ -1,7 +1,7 @@
-'3284',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70800,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,60800,,'',0,20000,,'',0,15000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'3284',1600,73700,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3284',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62200,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70800,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73700,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3288',1000700,70800,,'',0,19500,,'',0,15500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60800,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107321 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107321
index dcc7680c..1199d51a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107321
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107321
@@ -1,7 +1,7 @@
-'3284',700,62400,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71000,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,61000,,'',0,20000,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,73900,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
-'3284',1000700,73900,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,61000,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62400,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71000,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1600,73900,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
'3288',1000700,71000,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73900,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,61000,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107322 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107322
index 97c6c189..4b0cfcb6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107322
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107322
@@ -1,6 +1,6 @@
-'3284',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61000,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,61000,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71100,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,61000,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107324 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107324
index 7f0155c0..ca792f63 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107324
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107324
@@ -1,6 +1,6 @@
-'3284',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61100,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71200,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107325 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107325
index 339f4644..1e6d97b9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107325
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107325
@@ -1,6 +1,6 @@
-'3284',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61100,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3287',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62600,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71200,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71200,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74100,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
+'3489',1000700,61100,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107326 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107326
index bdb7bf42..94b61a55 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107326
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107326
@@ -1,6 +1,6 @@
-'3284',700,62700,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71300,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61200,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74200,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3287',1000700,61200,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62700,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71300,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71300,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74200,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
+'3489',1000700,61200,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107327 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107327
index 539c4753..18aa189d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107327
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107327
@@ -1,6 +1,6 @@
-'3284',700,62700,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3287',700,71300,,'',0,14600,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3287',1000700,61200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62700,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
+'3489',700,71300,,'',0,14600,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000700,71300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
+'3489',1000700,61200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107328 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107328
index 0b61d0f0..a0d4bae0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107328
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107328
@@ -1,6 +1,6 @@
-'3284',700,62800,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71400,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61300,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3287',1000700,61300,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62800,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71400,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71400,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74300,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
+'3489',1000700,61300,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107329 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107329
index 10af6324..d3c85402 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107329
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107329
@@ -1,6 +1,6 @@
-'3284',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,26900,,'',0
-'3287',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61400,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3287',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,26900,,'',0
+'3489',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71500,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
+'3489',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107330 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107330
index 410d8186..3eb8fddc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107330
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107330
@@ -1,6 +1,6 @@
-'3284',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61400,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
-'3287',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62900,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71500,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',1000700,71500,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74400,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,20000,,'',0
+'3489',1000700,61400,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107331 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107331
index 3b8c6209..a0a79a57 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107331
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107331
@@ -1,7 +1,7 @@
-'3284',700,63000,,'',0,21000,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71600,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
'3288',700,61500,,'',0,20100,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,74500,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3284',1000700,74500,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,20000,,'',0
-'3287',1000700,61500,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63000,,'',0,21000,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71600,,'',0,18500,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9900,,'',0,17000,,'',0
+'3486',1600,74500,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3288',1000700,71600,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74500,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,20000,,'',0
+'3489',1000700,61500,,'',0,19600,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107332 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107332
index d8c1b30b..c3528023 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107332
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107332
@@ -1,7 +1,7 @@
-'3284',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3287',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,74600,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3284',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3287',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
+'3489',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3486',1600,74600,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3288',1000700,71700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
+'3489',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107333 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107333
index 399a69ea..11eb0cc3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107333
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107333
@@ -1,7 +1,7 @@
-'3284',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
-'3287',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,74700,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
-'3284',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
-'3287',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,27000,,'',0
+'3489',700,71700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3486',1600,74700,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
'3288',1000700,71700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74700,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19900,,'',0
+'3489',1000700,61600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107334 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107334
index e87caf32..d89a4576 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107334
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107334
@@ -1,7 +1,7 @@
-'3284',700,63200,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,26900,,'',0
-'3287',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,74700,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
-'3284',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19800,,'',0
-'3287',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63200,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20200,,'',0,19800,,'',0,19900,,'',0,26900,,'',0
+'3489',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3486',1600,74700,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
'3288',1000700,71800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,13000,,'',0,19900,,'',0,19800,,'',0
+'3489',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107335 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107335
index fa6ef1e0..876c4e15 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107335
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107335
@@ -1,7 +1,7 @@
-'3284',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,27000,,'',0
-'3287',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1600,74800,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
-'3284',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19900,,'',0
-'3287',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,27000,,'',0
+'3489',700,71800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3486',1600,74800,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
'3288',1000700,71800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74800,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19900,,'',0
+'3489',1000700,61700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107336 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107336
index 51f8ee13..291696d0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107336
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107336
@@ -1,6 +1,6 @@
-'3284',700,63300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,26900,,'',0
-'3287',700,71900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74900,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19800,,'',0
-'3287',1000700,61800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,63300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20200,,'',0,19700,,'',0,19900,,'',0,26900,,'',0
+'3489',700,71900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000700,71900,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74900,,'',0,6500,,'',0,13000,,'',0,20100,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,19900,,'',0,19800,,'',0
+'3489',1000700,61800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107337 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107337
index 98acc62d..60fffd52 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107337
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107337
@@ -1,6 +1,6 @@
-'3284',700,63400,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,19900,4,'',0,26900,4,'',0
-'3284',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',700,72000,4,'',0,18600,4,'',0,21500,4,'',0,20600,4,'',0,21500,4,'',0,20900,4,'',0,20000,4,'',0,9800,4,'',0,17000,4,'',0
-'3287',701,72000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',700,61900,4,'',0,20200,4,'',0,19000,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0,12500,4,'',0
'3288',701,61900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3486',700,63400,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,19900,4,'',0,26900,4,'',0
+'3486',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',700,72000,4,'',0,18600,4,'',0,21500,4,'',0,20600,4,'',0,21500,4,'',0,20900,4,'',0,20000,4,'',0,9800,4,'',0,17000,4,'',0
+'3489',701,72000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107338 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107338
index d2500e66..1f70aba6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107338
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107338
@@ -1,6 +1,6 @@
-'3284',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107339 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107339
index d2500e66..1f70aba6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107339
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107339
@@ -1,6 +1,6 @@
-'3284',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62000,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72100,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75100,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107340 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107340
index 049307b4..33039205 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107340
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107340
@@ -1,6 +1,6 @@
-'3284',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107341 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107341
index 049307b4..33039205 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107341
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107341
@@ -1,6 +1,6 @@
-'3284',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75200,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107342 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107342
index 396f9ffe..f446a6d0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107342
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107342
@@ -1,6 +1,6 @@
-'3284',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72200,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62100,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107343 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107343
index 32fc1efa..8abd9954 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107343
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107343
@@ -1,6 +1,6 @@
-'3284',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75300,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107344 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107344
index e19d65ac..596f574e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107344
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107344
@@ -1,6 +1,6 @@
-'3284',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75400,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72300,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,75400,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62200,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107345 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107345
index 95e14720..8a535884 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107345
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107345
@@ -1,6 +1,6 @@
-'3284',701,63800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62300,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75500,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',701,63800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72400,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75500,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107346 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107346
index 77e13c00..3a3c6787 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107346
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107346
@@ -1,6 +1,6 @@
-'3284',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62300,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72400,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,75500,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62300,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107347 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107347
index a8516537..b0aa52f4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107347
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107347
@@ -1,6 +1,6 @@
-'3284',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62400,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62400,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',1000701,72500,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62400,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107348 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107348
index 868f3dea..44da9e8d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107348
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107348
@@ -1,4 +1,4 @@
-'3284',1601,75400,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
-'3284',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62500,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',1601,75400,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
'3288',1000701,72600,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000701,75700,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62500,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107349 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107349
index 9e36e405..1e8c095f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107349
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107349
@@ -1,4 +1,4 @@
-'3284',1601,75500,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
-'3284',1000701,75900,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',1601,75500,,'',0,16200,,'',0,64200,,'',0,8700,,'',0
'3288',1000701,72700,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,75900,0,'Montrose Exch',0,6400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62600,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107350 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107350
index e8d6b4a3..13b8c914 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107350
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107350
@@ -1,7 +1,7 @@
-'3284',201,51600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',201,60600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,62100,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
-'3284',1601,75600,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80000,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
+'3486',201,51600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5700,,'',0,1600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',201,60600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',1601,75600,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,72800,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80000,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62700,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107351 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107351
index 905c3772..1ab56ff4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107351
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107351
@@ -1,4 +1,4 @@
-'3284',1601,75700,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',1601,75700,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,72900,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80100,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62800,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107352 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107352
index 91375f3a..b6748c84 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107352
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107352
@@ -1,4 +1,4 @@
-'3284',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,72900,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62800,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107353 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107353
index 35c3f71b..92d2e38c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107353
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107353
@@ -1,7 +1,7 @@
-'3284',701,64300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62700,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',701,64300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72800,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
+'3486',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,73000,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80200,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107354 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107354
index c1f2125c..e07bd0ba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107354
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107354
@@ -1,7 +1,7 @@
-'3284',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3288',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3486',1601,75800,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,73000,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107355 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107355
index a96e116c..163bc632 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107355
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107355
@@ -1,7 +1,7 @@
-'3284',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3288',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3486',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,73000,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,62900,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107356 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107356
index 8a298b77..b38d7eb1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107356
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107356
@@ -1,7 +1,7 @@
-'3284',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3288',701,62800,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
-'3284',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,63000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
+'3486',701,64400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72900,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
+'3486',1601,75900,,'',0,16200,,'',0,68200,,'',0,4700,,'',0
'3288',1000701,73100,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80300,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,63000,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,21500,,'',0,24300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107357 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107357
index 01c1d294..d2c5d05e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107357
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107357
@@ -1,6 +1,6 @@
-'3284',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3288',701,62900,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,63000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73000,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,5800,,'',0,17000,,'',0
'3288',1000701,73100,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80400,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,63000,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107358 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107358
index e797f187..fac6a851 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107358
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107358
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107359 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107359
index e797f187..fac6a851 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107359
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107359
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107360 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107360
index c9398f9b..b23227a0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107360
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107360
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107361 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107361
index c9398f9b..b23227a0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107361
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107361
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107363 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107363
index 847afad5..332a4135 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107363
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107363
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107364 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107364
index 4f85f7e4..2a789e1f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107364
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107364
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107365 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107365
index a8d49076..ff170f78 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107365
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107365
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107366 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107366
index b035bce3..f262197b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107366
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107366
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107367 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107367
index afc73104..c10108b4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107367
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107367
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107368 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107368
index 76fe1ed7..99920b30 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107368
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107368
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107369 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107369
index a4481df6..4f073f67 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107369
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107369
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107370 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107370
index 3b8ec4cb..2931790f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107370
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107370
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107371 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107371
index 535f9625..f5b5af33 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107371
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107371
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107372 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107372
index ec6c57e6..4314f814 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107372
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107372
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107373 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107373
index 89064b18..f5fb3422 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107373
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107373
@@ -1 +1 @@
-'3284',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
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107374 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107374
index 1d7b9d83..7b63d6a9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107374
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107374
@@ -1,5 +1,5 @@
-'3284',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
-'3287',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3284',2600,144700,0,'Montrose Exch Only',0
-'3285',2600,80500,,'',0
+'3486',1501,61900,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,9000,,'',0
+'3489',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3289',2600,80500,,'',0
+'3486',2600,144700,0,'Montrose Exch Only',0
+'3487',2600,80500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107375 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107375
index 56bbd326..4ed95543 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107375
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107375
@@ -1,5 +1,5 @@
-'3284',1500,64300,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',2601,143300,,'',0
-'3285',2601,75200,,'',0
+'3486',1500,64300,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3289',2601,75200,,'',0
+'3486',2601,143300,,'',0
+'3487',2601,75200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107377 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107377
index 8a3412e3..51b9938d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107377
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107377
@@ -1,2 +1,2 @@
-'3284',1500,63800,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63800,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107378 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107378
index 7f0e86ee..3f28231e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107378
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107378
@@ -1,2 +1,2 @@
-'3284',1501,62400,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62400,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107379 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107379
index 04e3b5e5..809c1b48 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107379
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107379
@@ -1,2 +1,2 @@
-'3284',1501,62500,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62500,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107380 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107380
index d98d8d22..d6adc865 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107380
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107380
@@ -1,2 +1,2 @@
-'3284',1501,62600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107381 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107381
index e31f2a87..4d41e193 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107381
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107381
@@ -1,2 +1,2 @@
-'3284',1501,62800,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62800,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107382 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107382
index 8e869a9d..3028131c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107382
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107382
@@ -1,2 +1,2 @@
-'3284',1501,62900,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62900,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107383 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107383
index 70108b12..3c55bbea 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107383
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107383
@@ -1,2 +1,2 @@
-'3284',1501,63000,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1501,63000,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107384 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107384
index 44663ad9..cd4d7ab8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107384
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107384
@@ -1,2 +1,2 @@
-'3284',1501,63100,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1501,63100,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107385 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107385
index 8c5de44d..999af334 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107385
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107385
@@ -1,4 +1,4 @@
-'3284',1500,63300,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3284',1501,63300,4,'',0,8500,4,'',0,11800,4,'',0,68400,4,'',0,20600,4,'',0,8900,4,'',0
-'3287',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3287',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3486',1500,63300,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3486',1501,63300,4,'',0,8500,4,'',0,11800,4,'',0,68400,4,'',0,20600,4,'',0,8900,4,'',0
+'3489',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3489',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107386 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107386
index 58fab214..3422e76d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107386
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107386
@@ -1,2 +1,2 @@
-'3284',1500,63400,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63400,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107387 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107387
index 7ca8eb4e..9407ae01 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107387
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107387
@@ -1,2 +1,2 @@
-'3284',1500,63500,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63500,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107388 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107388
index 1530c052..8aa5da4d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107388
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107388
@@ -1,2 +1,2 @@
-'3284',1500,63600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63600,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107389 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107389
index de5ebe15..7e278547 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107389
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107389
@@ -1,2 +1,2 @@
-'3284',1500,63700,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63700,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107390 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107390
index 3d05b315..90a7477b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107390
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107390
@@ -1,3 +1,3 @@
-'3284',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',2600,145700,0,'Montrose Exch Only',0
+'3486',1500,63900,,'',0,8500,,'',0,11900,,'',0,68400,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',2600,145700,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107391 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107391
index 6b99b7b7..34a404f8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107391
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107391
@@ -1,5 +1,5 @@
-'3284',1500,64400,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',2601,143400,,'',0
-'3285',2601,75300,,'',0
+'3486',1500,64400,,'',0,8500,,'',0,12100,,'',0,68200,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3289',2601,75300,,'',0
+'3486',2601,143400,,'',0
+'3487',2601,75300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107392 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107392
index 25269481..8b996660 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107392
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107392
@@ -1,6 +1,6 @@
-'3284',701,64900,0,'Montrose Exch',0,25100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',701,63300,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80800,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
-'3287',1000701,63400,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64900,0,'Montrose Exch',0,25100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73400,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73500,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80800,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
+'3489',1000701,63400,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107393 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107393
index d6714d41..3c6bbe0a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107393
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107393
@@ -1,6 +1,6 @@
-'3284',701,64800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',701,63200,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
-'3287',1000701,63300,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73300,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73400,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80700,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,15800,0,'Montrose Exch',0
+'3489',1000701,63300,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107394 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107394
index ec73ed9e..2c527cab 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107394
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107394
@@ -1 +1 @@
-'3284',1600,74000,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
+'3486',1600,74000,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107395 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107395
index 704463a2..4f74cbd1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107395
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107395
@@ -1 +1 @@
-'3284',1600,74200,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
+'3486',1600,74200,,'',0,16500,,'',0,64100,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107396 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107396
index 963b2e2b..04124c12 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107396
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107396
@@ -1 +1 @@
-'3284',1600,74200,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3486',1600,74200,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107397 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107397
index 87ed71a7..bdfbe587 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107397
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107397
@@ -1 +1 @@
-'3284',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3486',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107398 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107398
index 87ed71a7..bdfbe587 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107398
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107398
@@ -1 +1 @@
-'3284',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
+'3486',1600,74300,,'',0,16500,,'',0,64100,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107399 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107399
index 3545cda4..a665cc28 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107399
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107399
@@ -1 +1 @@
-'3284',1600,74400,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
+'3486',1600,74400,,'',0,16400,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107400 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107400
index bb616770..f4d3189f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107400
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107400
@@ -1,2 +1,2 @@
-'3284',1600,74900,4,'',0,16300,4,'',0,64200,4,'',0,8600,4,'',0
-'3284',1601,74900,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3486',1600,74900,4,'',0,16300,4,'',0,64200,4,'',0,8600,4,'',0
+'3486',1601,74900,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107401 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107401
index f43620a5..d4d9b4c1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107401
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107401
@@ -1 +1 @@
-'3284',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3486',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107402 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107402
index f43620a5..d4d9b4c1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107402
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107402
@@ -1 +1 @@
-'3284',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3486',1601,75000,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107403 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107403
index 56974f15..1a873796 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107403
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107403
@@ -1 +1 @@
-'3284',1601,75100,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3486',1601,75100,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107404 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107404
index 931d80e9..fd53cf8a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107404
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107404
@@ -1 +1 @@
-'3284',1601,75200,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
+'3486',1601,75200,,'',0,16300,,'',0,64200,,'',0,8600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107405 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107405
index b32b6a3c..306f0b4f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107405
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107405
@@ -1 +1 @@
-'3284',1601,80100,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
+'3486',1601,80100,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107406 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107406
index 1cc19f39..8629188a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107406
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107406
@@ -1 +1 @@
-'3284',1601,80200,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
+'3486',1601,80200,,'',0,12200,,'',0,68200,,'',0,4700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107407 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107407
index e92f37ec..4f6c8b9c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107407
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107407
@@ -1 +1 @@
-'3284',1601,80300,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
+'3486',1601,80300,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107408 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107408
index a1baf9d5..48f05863 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107408
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107408
@@ -1,6 +1,6 @@
-'3284',1701,63100,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60300,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
-'3287',2101,74200,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1701,63100,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90400,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',2401,80000,0,'Ctr Loop',0
-'3284',1002101,72300,,'',0
+'3486',2101,60300,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,14900,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9600,,'',0,4100,,'',0,9700,,'',0,15900,,'',0,11200,,'',0
+'3489',2101,74200,,'',0,20000,,'',0,11600,,'',0,18900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',2401,80000,0,'Ctr Loop',0
+'3486',1002101,72300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107409 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107409
index 2342d023..82526024 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107409
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107409
@@ -1,5 +1,5 @@
-'3284',1701,63400,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60600,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74500,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1701,63400,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90700,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,72600,,'',0
+'3486',2101,60600,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74500,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1002101,72600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107410 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107410
index 7534de62..9ec2eaaa 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107410
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107410
@@ -1,5 +1,5 @@
-'3284',1701,63500,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2101,60700,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1701,63500,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3288',2101,90800,,'',0,13000,,'',0,16800,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,72700,,'',0
+'3486',2101,60700,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,11300,,'',0
+'3486',1002101,72700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107411 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107411
index 6821bc55..c75837ee 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107411
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107411
@@ -1 +1 @@
-'3284',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
+'3486',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107412 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107412
index 6723fa07..a676deba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107412
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107412
@@ -1 +1 @@
-'3284',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107413 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107413
index d3251aae..43da3e2b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107413
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107413
@@ -1 +1 @@
-'3284',1700,64300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107414 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107414
index 74f631a3..d22c6772 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107414
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107414
@@ -1,5 +1,5 @@
-'3284',1700,64400,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3284',2100,64900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82300,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1700,64400,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3288',2100,94600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,152000,,'',0,9500,,'',0
+'3486',2100,64900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82300,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,152000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107415 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107415
index 0876a216..fc0074a7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107415
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107415
@@ -1,5 +1,5 @@
-'3284',1700,64500,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3284',2100,65000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82400,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1700,64500,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3288',2100,94700,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,152100,,'',0,9500,,'',0
+'3486',2100,65000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82400,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,152100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107416 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107416
index 6821bc55..c75837ee 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107416
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107416
@@ -1 +1 @@
-'3284',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
+'3486',1701,63600,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107417 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107417
index 6f35c872..7283aed0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107417
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107417
@@ -1,2 +1,2 @@
-'3284',1700,63700,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,3600,,'',0
-'3284',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76500,4,'',0,7700,4,'',0,4300,4,'',0,8000,4,'',0,3600,4,'',0
+'3486',1700,63700,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,3600,,'',0
+'3486',1701,63700,4,'',0,7200,4,'',0,4900,4,'',0,76500,4,'',0,7700,4,'',0,4300,4,'',0,8000,4,'',0,3600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107418 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107418
index 251ed9eb..b1e45533 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107418
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107418
@@ -1 +1 @@
-'3284',1700,63800,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,63800,,'',0,7200,,'',0,4900,,'',0,76500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107419 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107419
index ed44e7a7..f1f0cc8d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107419
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107419
@@ -1 +1 @@
-'3284',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107420 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107420
index ed44e7a7..f1f0cc8d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107420
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107420
@@ -1 +1 @@
-'3284',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,63900,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107421 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107421
index 9a045fe9..f682d957 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107421
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107421
@@ -1 +1 @@
-'3284',1700,64000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64000,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107422 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107422
index 1783a1d9..72c1f390 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107422
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107422
@@ -1 +1 @@
-'3284',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107423 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107423
index 1783a1d9..72c1f390 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107423
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107423
@@ -1 +1 @@
-'3284',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64100,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107424 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107424
index 6723fa07..a676deba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107424
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107424
@@ -1 +1 @@
-'3284',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
+'3486',1700,64200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107425 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107425
index 8b746d8d..08986c7a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107425
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107425
@@ -1,5 +1,5 @@
-'3284',1700,64600,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3284',2100,65100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20600,,'',0,9100,,'',0,11600,,'',0,14900,,'',0
-'3287',2100,82500,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',1700,64600,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3288',2100,94800,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,152200,,'',0,9500,,'',0
+'3486',2100,65100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20600,,'',0,9100,,'',0,11600,,'',0,14900,,'',0
+'3489',2100,82500,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,152200,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107426 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107426
index 27edaa06..af48b4c3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107426
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107426
@@ -1,5 +1,5 @@
-'3284',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
-'3284',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13300,,'',0,20500,,'',0,9100,,'',0,15600,,'',0,10900,,'',0
-'3287',2100,82600,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',1700,64700,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7700,,'',0,4300,,'',0,8000,,'',0,7600,,'',0
'3288',2100,94900,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,152300,,'',0,9500,,'',0
+'3486',2100,65200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13300,,'',0,20500,,'',0,9100,,'',0,15600,,'',0,10900,,'',0
+'3489',2100,82600,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,16500,,'',0,11200,,'',0,9400,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,152300,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107427 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107427
index 4f7e7079..b7a2e529 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107427
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107427
@@ -1,4 +1,4 @@
-'3284',2101,60800,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74600,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,90800,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,72800,,'',0
+'3486',2101,60800,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74600,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,72800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107428 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107428
index af038a12..bfd0dbef 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107428
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107428
@@ -1,3 +1,3 @@
-'3284',2101,61000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,90900,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
+'3486',2101,61000,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107429 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107429
index 5c382d97..50871a27 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107429
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107429
@@ -1,4 +1,4 @@
-'3284',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,91100,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,74000,,'',0
+'3486',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,74000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107430 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107430
index 5c382d97..50871a27 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107430
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107430
@@ -1,4 +1,4 @@
-'3284',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,91100,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,74000,,'',0
+'3486',2101,61200,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,74900,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,74000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107431 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107431
index 7c619f44..4c3778b2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107431
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107431
@@ -1,4 +1,4 @@
-'3284',2101,61300,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,75000,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,91200,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,74100,,'',0
+'3486',2101,61300,,'',0,3200,,'',0,20100,,'',0,15600,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,75000,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,74100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107432 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107432
index 06735f05..ff173042 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107432
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107432
@@ -1,4 +1,4 @@
-'3284',2101,61400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,75100,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,91300,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,74200,,'',0
+'3486',2101,61400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16700,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9600,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,75100,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,74200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107433 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107433
index c9f28108..ba2d691d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107433
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107433
@@ -1,4 +1,4 @@
-'3284',2101,61600,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16800,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9500,,'',0,11900,,'',0,11100,,'',0
-'3287',2101,75300,,'',0,20000,,'',0,15700,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,91500,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,74400,,'',0
+'3486',2101,61600,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12200,,'',0,16800,,'',0,2800,,'',0,9700,,'',0,8100,,'',0,9500,,'',0,11900,,'',0,11100,,'',0
+'3489',2101,75300,,'',0,20000,,'',0,15700,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,74400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107434 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107434
index 1d108f85..d8def77d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107434
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107434
@@ -1,4 +1,4 @@
-'3284',2101,61800,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16700,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9600,,'',0,11800,,'',0,11100,,'',0
-'3287',2101,75500,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3288',2101,91700,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002101,74600,,'',0
+'3486',2101,61800,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16700,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9600,,'',0,11800,,'',0,11100,,'',0
+'3489',2101,75500,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3486',1002101,74600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107435 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107435
index ba604d9d..569943b8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107435
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107435
@@ -1,4 +1,4 @@
-'3284',2101,61900,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3287',2101,75600,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3288',2101,91800,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002101,74700,,'',0
+'3486',2101,61900,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3489',2101,75600,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3486',1002101,74700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107436 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107436
index f2d6fa1d..d55bac93 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107436
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107436
@@ -1,4 +1,4 @@
-'3284',2101,62000,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3287',2101,75700,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3288',2101,91900,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002101,74800,,'',0
+'3486',2101,62000,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3489',2101,75700,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3486',1002101,74800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107437 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107437
index 48a72fad..5ce9f39a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107437
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107437
@@ -1,4 +1,4 @@
-'3284',2101,62100,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3287',2101,75800,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
'3288',2101,92000,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002101,74900,,'',0
+'3486',2101,62100,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3489',2101,75800,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,12000,,'',0,15300,,'',0
+'3486',1002101,74900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107438 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107438
index 4338ac95..05a1cec5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107438
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107438
@@ -1,4 +1,4 @@
-'3284',2100,63700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81300,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150000,,'',0,5500,,'',0
+'3486',2100,63700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81300,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,150000,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107440 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107440
index 987e6704..ea29f2df 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107440
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107440
@@ -1,4 +1,4 @@
-'3284',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81400,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5600,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150100,,'',0,5500,,'',0
+'3486',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81400,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5600,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,150100,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107441 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107441
index 3e918d8f..905458b8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107441
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107441
@@ -1,4 +1,4 @@
-'3284',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81400,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93600,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150100,,'',0,5500,,'',0
+'3486',2100,63800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81400,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,150100,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107442 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107442
index 96c380e7..0ac8d92c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107442
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107442
@@ -1,4 +1,4 @@
-'3284',2100,63900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81500,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93700,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150200,,'',0,5500,,'',0
+'3486',2100,63900,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81500,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,150200,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107443 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107443
index ba99c22a..f0fcb9d9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107443
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107443
@@ -1,4 +1,4 @@
-'3284',2100,64000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81500,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93800,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150300,,'',0,5500,,'',0
+'3486',2100,64000,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81500,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,150300,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107444 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107444
index 5b125f0b..13bf3478 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107444
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107444
@@ -1,4 +1,4 @@
-'3284',2100,64100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,81600,,'',0,20100,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16200,,'',0,10900,,'',0
'3288',2100,93800,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,150400,,'',0,5500,,'',0
+'3486',2100,64100,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,81600,,'',0,20100,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,5500,,'',0,16200,,'',0,10900,,'',0
+'3486',1002100,150400,,'',0,5500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107445 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107445
index 56c21144..b9511019 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107445
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107445
@@ -1,4 +1,4 @@
-'3284',2100,64300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,81800,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12300,,'',0,10900,,'',0
'3288',2100,94100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12800,,'',0
-'3284',1002100,150700,,'',0,9500,,'',0
+'3486',2100,64300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,81800,,'',0,20200,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12300,,'',0,10900,,'',0
+'3486',1002100,150700,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107446 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107446
index 4d518398..27efeccc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107446
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107446
@@ -1,4 +1,4 @@
-'3284',2100,64500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,81900,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3288',2100,94200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,150900,,'',0,9500,,'',0
+'3486',2100,64500,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,81900,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,150900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107447 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107447
index 80956459..897daa5e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107447
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107447
@@ -1,4 +1,4 @@
-'3284',2100,64600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82000,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3288',2100,94300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,151000,,'',0,9500,,'',0
+'3486',2100,64600,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82000,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,151000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107448 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107448
index 8e1728d8..0ce285b4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107448
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107448
@@ -1,4 +1,4 @@
-'3284',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3288',2100,94400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,151100,,'',0,9500,,'',0
+'3486',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,151100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107449 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107449
index 8e1728d8..0ce285b4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107449
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107449
@@ -1,4 +1,4 @@
-'3284',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3288',2100,94400,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
-'3284',1002100,151100,,'',0,9500,,'',0
+'3486',2100,64700,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13100,,'',0,20500,,'',0,9300,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82100,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
+'3486',1002100,151100,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107450 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107450
index ac6661b7..364091bb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107450
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107450
@@ -1,3 +1,3 @@
-'3284',2100,64800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
-'3287',2100,82200,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
'3288',2100,94500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,12800,,'',0
+'3486',2100,64800,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,16500,,'',0,13200,,'',0,20500,,'',0,9200,,'',0,11600,,'',0,15000,,'',0
+'3489',2100,82200,,'',0,20200,,'',0,11900,,'',0,19100,,'',0,12500,,'',0,15200,,'',0,9500,,'',0,12200,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107451 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107451
index 5e5b265e..701418f6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107451
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107451
@@ -1,2 +1,2 @@
-'3284',1002100,151300,,'',0,9500,,'',0
-'3284',1002101,73200,,'',0
+'3486',1002100,151300,,'',0,9500,,'',0
+'3486',1002101,73200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107452 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107452
index ebe3116f..9b77b1c2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107452
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107452
@@ -1,2 +1,2 @@
-'3284',1002100,151500,,'',0,9500,,'',0
-'3284',1002101,73400,,'',0
+'3486',1002100,151500,,'',0,9500,,'',0
+'3486',1002101,73400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107453 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107453
index 6f4af722..35e030bc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107453
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107453
@@ -1,2 +1,2 @@
-'3284',1002100,151500,,'',0,9500,,'',0
-'3284',1002101,73500,,'',0
+'3486',1002100,151500,,'',0,9500,,'',0
+'3486',1002101,73500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107454 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107454
index a7bf5223..13c0b8e1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107454
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107454
@@ -1,2 +1,2 @@
-'3284',1002100,151700,,'',0,9500,,'',0
-'3284',1002101,73700,,'',0
+'3486',1002100,151700,,'',0,9500,,'',0
+'3486',1002101,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107455 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107455
index 7f2f9493..0c6cd275 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107455
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107455
@@ -1 +1 @@
-'3284',1002100,151900,,'',0,9500,,'',0
+'3486',1002100,151900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107456 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107456
index 7f2f9493..0c6cd275 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107456
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107456
@@ -1 +1 @@
-'3284',1002100,151900,,'',0,9500,,'',0
+'3486',1002100,151900,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107457 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107457
index a4ed6885..8ab15647 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107457
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107457
@@ -1 +1 @@
-'3284',1002101,73000,,'',0
+'3486',1002101,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107458 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107458
index aa1def1c..fa5332a9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107458
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107458
@@ -1 +1 @@
-'3284',1002101,73100,,'',0
+'3486',1002101,73100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107481 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107481
index 17ca3709..59894a58 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107481
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107481
@@ -1,6 +1,6 @@
-'3284',400,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3284',2600,144100,0,'Montrose Exch Only',0
-'3285',2600,80000,,'',0
+'3486',400,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2600,80000,,'',0
+'3486',2600,144100,0,'Montrose Exch Only',0
+'3487',2600,80000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107483 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107483
index 36a79ee0..b7fbdd6d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107483
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107483
@@ -1,3 +1,3 @@
-'3284',400,61400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70400,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
+'3486',400,61400,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61900,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107485 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107485
index 3f7890b8..d4903c4f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107485
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107485
@@ -1,9 +1,9 @@
-'3284',3100,72700,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90800,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',3100,112200,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,64200,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
-'3287',1003100,83100,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72700,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90800,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,83100,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62900,,'',0,3000,,'',0
-'3285',24003100,60000,,'',0
+'3486',1003100,64200,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10800,,'',0
+'3489',1003100,83100,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,60000,,'',0
+'3486',24003100,62900,,'',0,3000,,'',0
+'3487',24003100,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107486 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107486
index 28361de0..1c2e5b7c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107486
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107486
@@ -1,9 +1,9 @@
-'3284',3100,72800,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3800,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3500,,'',0
-'3287',3100,90900,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',3100,112300,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,64400,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3287',1003100,83300,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
+'3486',3100,72800,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,9900,,'',0,3800,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,3500,,'',0
+'3489',3100,90900,,'',0,9900,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,83300,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,14900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10400,,'',0
-'3284',24003100,63000,,'',0,7000,,'',0
-'3285',24003100,60100,,'',0
+'3486',1003100,64400,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,8900,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11300,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
+'3489',1003100,83300,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,11100,,'',0,7500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3289',24003100,60100,,'',0
+'3486',24003100,63000,,'',0,7000,,'',0
+'3487',24003100,60100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107487 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107487
index 7dd14e43..f2917bd9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107487
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107487
@@ -1,5 +1,5 @@
-'3284',1003101,73100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,70100,,'',0
-'3287',1003101,83700,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3288',1003101,91000,,'',0,21400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,70100,,'',0
+'3486',1003101,73100,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,70100,,'',0
+'3489',1003101,83700,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107488 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107488
index ee4df3ec..7d12ecdc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107488
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107488
@@ -1,5 +1,5 @@
-'3284',1003101,73200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,70200,,'',0
-'3287',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3288',1003101,91100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,70200,,'',0
+'3486',1003101,73200,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,70200,,'',0
+'3489',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107489 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107489
index 023ccffd..48814100 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107489
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107489
@@ -1,5 +1,5 @@
-'3284',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10600,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,70300,,'',0
-'3287',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
'3288',1003101,91100,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11100,,'',0,11400,,'',0,11400,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,70300,,'',0
+'3486',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10600,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,70300,,'',0
+'3489',1003101,83800,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11200,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10800,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107490 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107490
index 8b2ec423..b6ebb320 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107490
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107490
@@ -1,3 +1,3 @@
-'3284',1003100,65000,,'',0,6900,,'',0,3200,,'',0,7400,,'',0,8800,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3287',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3288',1003100,83900,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10400,,'',0
+'3486',1003100,65000,,'',0,6900,,'',0,3200,,'',0,7400,,'',0,8800,,'',0,10100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
+'3489',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107491 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107491
index 2c0b0666..ef211046 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107491
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107491
@@ -1,3 +1,3 @@
-'3284',1003100,65000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3287',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3288',1003100,83900,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,12000,,'',0,10400,,'',0
+'3486',1003100,65000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
+'3489',1003100,83900,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107492 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107492
index d5f3057b..adbb559a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107492
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107492
@@ -1,3 +1,3 @@
-'3284',1003100,65100,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
-'3287',1003100,84000,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
'3288',1003100,84000,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,12000,,'',0,10400,,'',0
+'3486',1003100,65100,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9200,,'',0,7300,,'',0,4100,,'',0,9000,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,10800,,'',0
+'3489',1003100,84000,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,11700,,'',0,10100,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107493 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107493
index 3b261548..f76f9808 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107493
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107493
@@ -1,3 +1,3 @@
-'3284',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62500,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3486',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,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72600,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107498 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107498
index a467be58..55f82941 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107498
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107498
@@ -1,4 +1,4 @@
-'3284',2101,60900,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
-'3287',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
'3288',2101,90900,,'',0,13000,,'',0,16900,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,17000,,'',0
-'3284',1002101,72900,,'',0
+'3486',2101,60900,,'',0,3200,,'',0,20100,,'',0,11600,,'',0,15000,,'',0,12200,,'',0,12700,,'',0,6800,,'',0,9700,,'',0,8100,,'',0,5600,,'',0,15900,,'',0,11100,,'',0
+'3489',2101,74700,,'',0,20000,,'',0,15700,,'',0,15000,,'',0,16500,,'',0,11200,,'',0,9600,,'',0,12100,,'',0,15300,,'',0
+'3486',1002101,72900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107499 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107499
index 4807010d..683c4d26 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107499
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107499
@@ -1,25 +1,25 @@
-'3284',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
-'3287',101,62100,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,62400,,'',0,8000,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8700,,'',0,3500,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2700,,'',0,9400,,'',0
-'3287',400,63600,4,'',0,9000,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,11000,4,'',0,14900,4,'',0,9800,4,'',0,10400,4,'',0,9900,4,'',0
+'3486',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3100,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,6400,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1400,,'',0,4700,,'',0,2600,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3200,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2500,,'',0
+'3489',101,62100,,'',0,8000,,'',0,4500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,2500,,'',0,7400,,'',0,7600,,'',0,2400,,'',0,2400,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,72100,4,'',0,20200,4,'',0,13000,4,'',0,17200,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,12800,4,'',0
-'3284',500,62100,4,'',0,9300,4,'',0,10900,4,'',0,2900,4,'',0,6900,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,7500,4,'',0,3600,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7900,4,'',0,3500,4,'',0,7500,4,'',0,3700,4,'',0,7600,4,'',0,3200,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,7400,4,'',0,2900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
-'3285',500,74700,4,'',0
-'3287',500,71100,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7600,4,'',0,2900,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0,9400,4,'',0
+'3489',400,63600,4,'',0,9000,4,'',0,10100,4,'',0,10200,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10900,4,'',0,10000,4,'',0,11000,4,'',0,14900,4,'',0,9800,4,'',0,10400,4,'',0,9900,4,'',0
'3288',500,65000,4,'',0,10200,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0,10200,4,'',0,9200,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9000,4,'',0,9500,4,'',0,9100,4,'',0,4900,4,'',0,9900,4,'',0
'3289',500,74700,4,'',0
-'3287',701,74100,4,'',0,18600,4,'',0,21500,4,'',0,20700,4,'',0,25500,4,'',0,20800,4,'',0,20000,4,'',0,9800,4,'',0,13000,4,'',0
+'3486',500,62100,4,'',0,9300,4,'',0,10900,4,'',0,2900,4,'',0,6900,4,'',0,3400,4,'',0,7300,4,'',0,3100,4,'',0,7100,4,'',0,7500,4,'',0,3600,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7900,4,'',0,3500,4,'',0,7500,4,'',0,3700,4,'',0,7600,4,'',0,3200,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,7400,4,'',0,2900,4,'',0,8300,4,'',0,4400,4,'',0,9800,4,'',0
+'3487',500,74700,4,'',0
+'3489',500,71100,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3700,4,'',0,7000,4,'',0,3000,4,'',0,7600,4,'',0,7600,4,'',0,2900,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0,9400,4,'',0
'3288',701,64000,4,'',0,20200,4,'',0,19000,4,'',0,20100,4,'',0,20100,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'3287',901,71800,4,'',0,9500,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,9900,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'3489',701,74100,4,'',0,18600,4,'',0,21500,4,'',0,20700,4,'',0,25500,4,'',0,20800,4,'',0,20000,4,'',0,9800,4,'',0,13000,4,'',0
'3288',901,70800,4,'',0,13000,4,'',0,17200,4,'',0,13100,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,13000,4,'',0,16000,4,'',0,12900,4,'',0
-'3284',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
-'3284',2101,55800,,'',0,7200,,'',0,20000,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
-'3287',2101,73600,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3489',901,71800,4,'',0,9500,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,9900,4,'',0,10500,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10500,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'3486',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
'3288',2101,85800,,'',0,17000,,'',0,12700,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0
-'3284',2400,150400,4,'',0
-'3284',2401,81500,4,'',0
-'3285',2600,82500,4,'',0
+'3486',2101,55800,,'',0,7200,,'',0,20000,,'',0,11600,,'',0,10900,,'',0,16200,,'',0,12600,,'',0,6700,,'',0,9600,,'',0,4100,,'',0,9800,,'',0,15900,,'',0,11300,,'',0
+'3489',2101,73600,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16500,,'',0,11200,,'',0,9700,,'',0,12100,,'',0,11300,,'',0
+'3486',2400,150400,4,'',0
+'3486',2401,81500,4,'',0
'3289',2600,82500,4,'',0
-'3287',1000701,64100,4,'',0,19800,4,'',0,20500,4,'',0,20100,4,'',0,21200,4,'',0,25400,4,'',0,20300,4,'',0
+'3487',2600,82500,4,'',0
'3288',1000701,74200,4,'',0,19700,4,'',0,19500,4,'',0,20200,4,'',0,20100,4,'',0,19900,4,'',0
-'3284',1002101,71700,,'',0
+'3489',1000701,64100,4,'',0,19800,4,'',0,20500,4,'',0,20100,4,'',0,21200,4,'',0,25400,4,'',0,20300,4,'',0
+'3486',1002101,71700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107500 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107500
index 5e594261..37621443 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107500
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107500
@@ -1,13 +1,13 @@
-'3284',201,53100,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,1000,4,'',0,5000,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,62100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63600,,'',0,8000,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8800,,'',0,9500,,'',0,4400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3284',301,55900,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
-'3285',301,72100,,'',0
-'3287',301,64900,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
+'3486',201,53100,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,1800,,'',0,1000,4,'',0,5000,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,3100,,'',0,6700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,62100,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',301,62900,,'',0,10100,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,5000,,'',0,9500,,'',0,9200,,'',0,9000,,'',0,9900,,'',0
'3289',301,72100,,'',0
-'3284',601,55500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
-'3287',601,60400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',301,55900,,'',0,9200,,'',0,10200,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,7600,,'',0,3700,,'',0,7700,,'',0,3600,,'',0,7300,,'',0,3400,,'',0,7000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4300,,'',0,8400,,'',0,9900,,'',0
+'3487',301,72100,,'',0
+'3489',301,64900,,'',0,10100,,'',0,10100,,'',0,6900,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9500,,'',0
'3288',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,11500,,'',0,16000,,'',0
-'3284',2400,142000,0,'Ctr Loop',0
-'3284',2401,73500,0,'Ctr Loop',0
+'3486',601,55500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,4000,,'',0,11500,,'',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
+'3489',601,60400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,9500,,'',0
+'3486',2400,142000,0,'Ctr Loop',0
+'3486',2401,73500,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107501 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107501
index d9f269f6..d9cb7ad8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107501
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107501
@@ -1,13 +1,13 @@
-'3284',1701,62600,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
-'3284',2201,144500,,'',0
-'3285',2201,80000,,'',0
+'3486',1701,62600,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,8000,,'',0,3600,,'',0
'3289',2201,83000,,'',0
-'3284',3100,72100,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
-'3287',3100,90200,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
+'3486',2201,144500,,'',0
+'3487',2201,80000,,'',0
'3288',3100,111600,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,15600,,'',0,10400,,'',0
-'3284',1003100,63600,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,4900,,'',0,14100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
-'3287',1003100,82500,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
+'3486',3100,72100,,'',0,3100,,'',0,7500,,'',0,10500,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,10800,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6800,,'',0,900,,'',0,3600,,'',0
+'3489',3100,90200,,'',0,9900,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15600,,'',0,11000,,'',0
'3288',1003100,82500,,'',0,10500,,'',0,10900,,'',0,11000,,'',0,10900,,'',0,15400,,'',0,11500,,'',0,10900,,'',0,18400,,'',0,12000,,'',0,10500,,'',0
-'3284',24003100,62300,,'',0,3000,,'',0
-'3285',24003100,55400,,'',0
+'3486',1003100,63600,,'',0,6900,,'',0,3200,,'',0,7300,,'',0,4900,,'',0,14100,,'',0,11300,,'',0,11000,,'',0,11000,,'',0,11200,,'',0,7900,,'',0,9200,,'',0,3400,,'',0,8200,,'',0,9100,,'',0,8200,,'',0,12700,,'',0,10500,,'',0,10900,,'',0
+'3489',1003100,82500,,'',0,10400,,'',0,11000,,'',0,10800,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,11000,,'',0,11200,,'',0,7500,,'',0,11700,,'',0,10200,,'',0,9800,,'',0
'3289',24003100,55400,,'',0
+'3486',24003100,62300,,'',0,3000,,'',0
+'3487',24003100,55400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107740 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107740
index 9ee5322b..9013dcb0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107740
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107740
@@ -1,8 +1,8 @@
-'3284',2100,63400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3284',2101,62200,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
-'3287',2100,81000,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9500,,'',0,16300,,'',0,10900,,'',0
-'3287',2101,75900,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
'3288',2100,93200,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12900,,'',0
'3288',2101,92100,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002100,145700,,'',0,9500,,'',0
-'3284',1002101,75000,,'',0
+'3486',2100,63400,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3486',2101,62200,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11100,,'',0
+'3489',2100,81000,,'',0,20100,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9500,,'',0,16300,,'',0,10900,,'',0
+'3489',2101,75900,,'',0,20000,,'',0,15800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
+'3486',1002100,145700,,'',0,9500,,'',0
+'3486',1002101,75000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107742 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107742
index e43ed9d0..d0c3a1d5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107742
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107742
@@ -1,4 +1,4 @@
-'3284',2101,62400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16900,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9400,,'',0,11800,,'',0,11100,,'',0
-'3287',2101,80100,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,15900,,'',0,11300,,'',0
'3288',2101,92300,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,16900,,'',0
-'3284',1002101,75200,,'',0
+'3486',2101,62400,,'',0,3200,,'',0,20200,,'',0,15500,,'',0,11000,,'',0,12300,,'',0,16900,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9400,,'',0,11800,,'',0,11100,,'',0
+'3489',2101,80100,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,15900,,'',0,11300,,'',0
+'3486',1002101,75200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107744 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107744
index 2c0ba1cb..785b910a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107744
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107744
@@ -1,4 +1,4 @@
-'3284',2101,62500,,'',0,3200,,'',0,24300,,'',0,11500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11000,,'',0
-'3287',2101,80300,,'',0,20000,,'',0,11800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
'3288',2101,92500,,'',0,13000,,'',0,16900,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0
-'3284',1002101,75400,,'',0
+'3486',2101,62500,,'',0,3200,,'',0,24300,,'',0,11500,,'',0,11000,,'',0,12300,,'',0,16800,,'',0,2900,,'',0,9700,,'',0,8000,,'',0,9500,,'',0,11800,,'',0,11000,,'',0
+'3489',2101,80300,,'',0,20000,,'',0,11800,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16000,,'',0,11300,,'',0
+'3486',1002101,75400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107746 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107746
index 31a2ac96..27cde505 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107746
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107746
@@ -1,8 +1,8 @@
-'3284',2100,63200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3284',2101,62700,4,'',0,3200,4,'',0,24300,4,'',0,11500,4,'',0,11000,4,'',0,12300,4,'',0,16900,4,'',0,2900,4,'',0,9700,4,'',0,8000,4,'',0,9400,4,'',0,11800,4,'',0,11000,4,'',0
-'3287',2100,80800,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
-'3287',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19000,4,'',0,12500,4,'',0,11200,4,'',0,9600,4,'',0,15900,4,'',0,11300,4,'',0
'3288',2100,93000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12900,,'',0,16900,,'',0
'3288',2101,92700,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12900,4,'',0,16900,4,'',0
-'3284',1002100,145500,,'',0,9500,,'',0
-'3284',1002101,75600,4,'',0
+'3486',2100,63200,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3486',2101,62700,4,'',0,3200,4,'',0,24300,4,'',0,11500,4,'',0,11000,4,'',0,12300,4,'',0,16900,4,'',0,2900,4,'',0,9700,4,'',0,8000,4,'',0,9400,4,'',0,11800,4,'',0,11000,4,'',0
+'3489',2100,80800,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3489',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,19000,4,'',0,12500,4,'',0,11200,4,'',0,9600,4,'',0,15900,4,'',0,11300,4,'',0
+'3486',1002100,145500,,'',0,9500,,'',0
+'3486',1002101,75600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107747 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107747
index a63e73f2..42cb715e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107747
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107747
@@ -1,4 +1,4 @@
-'3284',2100,63300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
-'3287',2100,80900,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
'3288',2100,93100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16900,,'',0,12900,,'',0
-'3284',1002100,145600,,'',0,9500,,'',0
+'3486',2100,63300,,'',0,7200,,'',0,9600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,12500,,'',0,17000,,'',0,20500,,'',0,9300,,'',0,11700,,'',0,11000,,'',0
+'3489',2100,80900,,'',0,20000,,'',0,11900,,'',0,19000,,'',0,12500,,'',0,11200,,'',0,9600,,'',0,16300,,'',0,10900,,'',0
+'3486',1002100,145600,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
index 371a2a0f..0463351b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
@@ -1,19 +1,19 @@
-'3284',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
-'3287',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3101,100300,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3284',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62100,,'',0
-'3287',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3486',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3489',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3289',3201,62100,,'',0
-'3284',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
-'3287',3500,84300,,'',0,67200,,'',0,22000,,'',0
+'3486',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62100,,'',0
+'3489',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3500,100000,,'',0,21500,,'',0,63400,,'',0
-'3284',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
+'3486',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
+'3489',3500,84300,,'',0,67200,,'',0,22000,,'',0
'3288',3900,93300,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
-'3284',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3285',1003101,65100,,'',0
-'3287',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3486',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
'3288',1003101,85900,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3289',1003101,65100,,'',0
+'3486',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3487',1003101,65100,,'',0
+'3489',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
index a25d4b7d..4aaf06d3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
@@ -1,13 +1,13 @@
-'3284',3101,62100,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
-'3287',3101,75600,,'',0,10300,,'',0,14500,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3101,100400,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3284',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62100,,'',0
-'3287',3201,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3486',3101,62100,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
+'3489',3101,75600,,'',0,10300,,'',0,14500,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3289',3201,62100,,'',0
-'3284',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3285',1003101,65100,,'',0
-'3287',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3486',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62100,,'',0
+'3489',3201,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',1003101,85900,,'',0,25300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3289',1003101,65100,,'',0
+'3486',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3487',1003101,65100,,'',0
+'3489',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107754 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107754
index 2ce57980..5d47d072 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107754
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107754
@@ -1,14 +1,14 @@
-'3284',3100,73900,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7500,,'',0
-'3284',3101,62700,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11700,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2700,,'',0,7200,,'',0,1700,,'',0,38400,,'',0
-'3287',3100,91900,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
-'3287',3101,80200,,'',0,10300,,'',0,10500,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3288',3100,113400,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
'3288',3101,101000,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3284',1003100,65600,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9300,,'',0,7300,,'',0,4100,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,14800,,'',0
-'3284',1003101,72700,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11600,,'',0,9400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,2400,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,65700,,'',0
-'3287',1003100,84500,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,5800,,'',0
-'3287',1003101,83200,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
+'3486',3100,73900,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7500,,'',0
+'3486',3101,62700,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11700,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2700,,'',0,7200,,'',0,1700,,'',0,38400,,'',0
+'3489',3100,91900,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
+'3489',3101,80200,,'',0,10300,,'',0,10500,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3288',1003100,84500,,'',0,10500,,'',0,10900,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,18300,,'',0,16000,,'',0,10400,,'',0
'3288',1003101,90500,,'',0,21400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,14900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,65700,,'',0
+'3486',1003100,65600,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9300,,'',0,7300,,'',0,4100,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10400,,'',0,14800,,'',0
+'3486',1003101,72700,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11600,,'',0,9400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,2400,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,65700,,'',0
+'3489',1003100,84500,,'',0,10400,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,5800,,'',0
+'3489',1003101,83200,,'',0,10600,,'',0,10500,,'',0,11100,,'',0,15100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,15000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107755 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107755
index 9f5b2082..5bacec65 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107755
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107755
@@ -1,17 +1,17 @@
-'3284',3100,74200,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,7600,,'',0,2700,,'',0,800,,'',0,7500,,'',0
-'3287',3100,92200,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3288',3100,113700,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
-'3284',3200,61000,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,7500,,'',0,3800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
-'3285',3200,64100,,'',0
-'3287',3200,81500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,8500,,'',0,2900,,'',0,7000,,'',0,13000,,'',0
+'3486',3100,74200,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,7600,,'',0,2700,,'',0,800,,'',0,7500,,'',0
+'3489',3100,92200,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3288',3200,81600,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3289',3200,64100,,'',0
-'3284',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81400,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,9900,,'',0
+'3486',3200,61000,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,7500,,'',0,3800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
+'3487',3200,64100,,'',0
+'3489',3200,81500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,8500,,'',0,2900,,'',0,7000,,'',0,13000,,'',0
'3288',3300,84400,,'',0,10700,,'',0,15000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,16000,,'',0,10000,,'',0
-'3284',1003100,65900,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9400,,'',0,7300,,'',0,4000,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10300,,'',0,14800,,'',0
-'3287',1003100,84800,,'',0,10400,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,9800,,'',0
+'3486',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81400,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,9900,,'',0
'3288',1003100,84800,,'',0,10500,,'',0,14900,,'',0,11000,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,14300,,'',0,16000,,'',0,10400,,'',0
-'3284',24003100,64200,,'',0,7000,,'',0
-'3285',24003100,61200,,'',0
+'3486',1003100,65900,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15400,,'',0,3900,,'',0,9400,,'',0,7300,,'',0,4000,,'',0,8900,,'',0,8200,,'',0,12700,,'',0,10300,,'',0,14800,,'',0
+'3489',1003100,84800,,'',0,10400,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,15700,,'',0,10100,,'',0,9800,,'',0
'3289',24003100,61200,,'',0
+'3486',24003100,64200,,'',0,7000,,'',0
+'3487',24003100,61200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
index 94869b62..0a00687a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
@@ -1,13 +1,13 @@
-'3284',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
-'3287',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3101,100200,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3284',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62000,,'',0
-'3287',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3486',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3489',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
'3288',3201,75500,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3289',3201,62000,,'',0
-'3284',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
-'3285',1003101,65000,,'',0
-'3287',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3486',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62000,,'',0
+'3489',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',1003101,85800,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3289',1003101,65000,,'',0
+'3486',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3487',1003101,65000,,'',0
+'3489',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107758 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107758
index d4bfec4f..5b5d9fbe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107758
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107758
@@ -1,5 +1,5 @@
-'3284',3201,55400,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62500,,'',0
-'3287',3201,75900,,'',0,7100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,75900,,'',0,14300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62500,,'',0
+'3486',3201,55400,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62500,,'',0
+'3489',3201,75900,,'',0,7100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107759 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107759
index d7457872..cddba61c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107759
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107759
@@ -1,8 +1,8 @@
-'3284',3201,55500,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62600,,'',0
-'3287',3201,80000,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62600,,'',0
-'3284',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55500,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62600,,'',0
+'3489',3201,80000,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107761 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107761
index 9be5416b..7fcb8fe5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107761
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107761
@@ -1,8 +1,8 @@
-'3284',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62700,,'',0
-'3287',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62700,,'',0
-'3284',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62700,,'',0
+'3489',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107762 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107762
index 5801b5e3..de5873cb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107762
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107762
@@ -1,8 +1,8 @@
-'3284',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62700,,'',0
-'3287',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62700,,'',0
-'3284',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62700,,'',0
+'3489',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107763 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107763
index 65beb867..a79d3d58 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107763
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107763
@@ -1,8 +1,8 @@
-'3284',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62800,,'',0
-'3287',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62800,,'',0
-'3284',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62800,,'',0
+'3489',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91500,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107764 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107764
index 907bc9fa..1427ae41 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107764
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107764
@@ -1,8 +1,8 @@
-'3284',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62800,,'',0
-'3287',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62800,,'',0
-'3284',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55700,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62800,,'',0
+'3489',3201,80200,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91600,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107765 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107765
index 512857a5..9ef03915 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107765
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107765
@@ -1,8 +1,8 @@
-'3284',3201,55800,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62900,,'',0
-'3287',3201,80300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80300,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62900,,'',0
-'3284',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55800,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62900,,'',0
+'3489',3201,80300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91700,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107766 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107766
index 4fd13c79..5cb0ebe1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107766
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107766
@@ -1,8 +1,8 @@
-'3284',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63000,,'',0
-'3287',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63000,,'',0
-'3284',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63000,,'',0
+'3489',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91700,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107767 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107767
index 8cfad6a1..cc7e4a33 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107767
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107767
@@ -1,5 +1,5 @@
-'3284',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63000,,'',0
-'3287',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63000,,'',0
+'3486',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63000,,'',0
+'3489',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107768 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107768
index 8cfad6a1..cc7e4a33 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107768
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107768
@@ -1,5 +1,5 @@
-'3284',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63000,,'',0
-'3287',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63000,,'',0
+'3486',3201,55900,,'',0,14100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63000,,'',0
+'3489',3201,80400,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107769 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107769
index 48384f61..4c853bad 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107769
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107769
@@ -1,5 +1,5 @@
-'3284',3201,60000,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63100,,'',0
-'3287',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80500,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63100,,'',0
+'3486',3201,60000,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63100,,'',0
+'3489',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107770 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107770
index 790165c0..192fe1df 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107770
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107770
@@ -1,5 +1,5 @@
-'3284',3201,60000,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63100,,'',0
-'3287',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80600,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63100,,'',0
+'3486',3201,60000,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63100,,'',0
+'3489',3201,80500,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107771 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107771
index d9aacff1..10a20420 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107771
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107771
@@ -1,5 +1,5 @@
-'3284',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63200,,'',0
-'3287',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80700,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63200,,'',0
+'3486',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63200,,'',0
+'3489',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107772 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107772
index d9aacff1..10a20420 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107772
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107772
@@ -1,5 +1,5 @@
-'3284',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,63200,,'',0
-'3287',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80700,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,63200,,'',0
+'3486',3201,60100,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,63200,,'',0
+'3489',3201,80600,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107773 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107773
index 02abd612..12e31fc0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107773
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107773
@@ -1,10 +1,10 @@
-'3284',3200,60200,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3284',3201,60200,4,'',0,10100,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3700,4,'',0,7800,4,'',0,3500,4,'',0,7800,4,'',0,7200,4,'',0,3500,4,'',0,7400,4,'',0,4400,4,'',0,6700,4,'',0,9500,4,'',0,10500,4,'',0
-'3285',3200,63300,,'',0
-'3285',3201,63300,4,'',0
-'3287',3200,80700,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
-'3287',3201,80700,4,'',0,3100,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,4500,4,'',0,6900,4,'',0,3000,4,'',0,17000,4,'',0
'3288',3200,80800,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3288',3201,80800,4,'',0,10300,4,'',0,10300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7900,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,15000,4,'',0,11500,4,'',0
'3289',3200,63300,,'',0
'3289',3201,63300,4,'',0
+'3486',3200,60200,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3486',3201,60200,4,'',0,10100,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3700,4,'',0,7800,4,'',0,3500,4,'',0,7800,4,'',0,7200,4,'',0,3500,4,'',0,7400,4,'',0,4400,4,'',0,6700,4,'',0,9500,4,'',0,10500,4,'',0
+'3487',3200,63300,,'',0
+'3487',3201,63300,4,'',0
+'3489',3200,80700,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
+'3489',3201,80700,4,'',0,3100,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3600,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,4500,4,'',0,6900,4,'',0,3000,4,'',0,17000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107774 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107774
index bf95b07d..851a2d18 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107774
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107774
@@ -1,5 +1,5 @@
-'3284',3200,60300,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63400,,'',0
-'3287',3200,80800,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,80900,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63400,,'',0
+'3486',3200,60300,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63400,,'',0
+'3489',3200,80800,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107775 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107775
index e104ec8f..c3308eba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107775
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107775
@@ -1,5 +1,5 @@
-'3284',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63500,,'',0
-'3287',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63500,,'',0
+'3486',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63500,,'',0
+'3489',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107776 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107776
index c760eec7..e56766dc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107776
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107776
@@ -1,5 +1,5 @@
-'3284',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63500,,'',0
-'3287',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81000,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63500,,'',0
+'3486',3200,60400,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63500,,'',0
+'3489',3200,80900,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107777 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107777
index 9eccc13a..38b8f305 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107777
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107777
@@ -1,5 +1,5 @@
-'3284',3200,60500,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63600,,'',0
-'3287',3200,81000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81100,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63600,,'',0
+'3486',3200,60500,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63600,,'',0
+'3489',3200,81000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107778 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107778
index cc7752e7..8cb0eed6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107778
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107778
@@ -1,5 +1,5 @@
-'3284',3200,60600,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10400,,'',0
-'3285',3200,63700,,'',0
-'3287',3200,81100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81200,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63700,,'',0
+'3486',3200,60600,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10400,,'',0
+'3487',3200,63700,,'',0
+'3489',3200,81100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107779 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107779
index 38252c34..092c9eb1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107779
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107779
@@ -1,5 +1,5 @@
-'3284',3200,60600,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63700,,'',0
-'3287',3200,81100,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81200,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63700,,'',0
+'3486',3200,60600,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,4400,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63700,,'',0
+'3489',3200,81100,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107781 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107781
index 3b8193cc..84613926 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107781
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107781
@@ -1,3 +1,3 @@
-'3284',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,91300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107783 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107783
index 6503ee3f..0d75a74f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107783
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107783
@@ -1,3 +1,3 @@
-'3284',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3287',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3288',3900,90100,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,14000,,'',0
+'3486',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'3489',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
index 5c26c3da..78bb149c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
@@ -1,3 +1,3 @@
-'3284',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,82700,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
index ecaf5f1d..e461b279 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
@@ -1,6 +1,6 @@
-'3284',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,82800,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3284',3400,60900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3287',3400,81400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3486',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3400,84100,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3489',3400,81400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107788 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107788
index 8f230a24..751ce20c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107788
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107788
@@ -1,6 +1,6 @@
-'3284',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,82900,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3284',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3900,92500,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107789 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107789
index 8f230a24..751ce20c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107789
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107789
@@ -1,6 +1,6 @@
-'3284',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,82900,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3284',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3301,55400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,75900,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3900,92500,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107790 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107790
index fcb3b753..a3654349 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107790
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107790
@@ -1,3 +1,3 @@
-'3284',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83000,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107791 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107791
index 781146e2..bb9b460a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107791
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107791
@@ -1,3 +1,3 @@
-'3284',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,83100,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107792 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107792
index 838ff1ce..d735ea83 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107792
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107792
@@ -1,3 +1,3 @@
-'3284',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83100,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107793 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107793
index 69b795fe..bcc2c570 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107793
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107793
@@ -1,3 +1,3 @@
-'3284',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80200,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83200,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80200,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107794 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107794
index c24c8615..decf28f7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107794
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107794
@@ -1,6 +1,6 @@
-'3284',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83300,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
-'3284',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3486',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3401,83000,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3486',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107795 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107795
index 00102abb..49905fac 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107795
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107795
@@ -1,3 +1,3 @@
-'3284',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,83300,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80300,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107796 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107796
index ac0eaae0..468814e9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107796
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107796
@@ -1,3 +1,3 @@
-'3284',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83400,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107797 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107797
index 5fe28bc8..973118a1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107797
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107797
@@ -1,3 +1,3 @@
-'3284',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83400,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80400,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107798 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107798
index c958cc95..01c627a8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107798
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107798
@@ -1,3 +1,3 @@
-'3284',3301,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,80500,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3301,83500,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3301,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8200,,'',0,7400,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,80500,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107800 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107800
index 9d87723f..9e44a4e6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107800
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107800
@@ -1,3 +1,3 @@
-'3284',3300,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,80700,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
'3288',3300,83700,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,80700,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107801 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107801
index f2d8e79b..59778714 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107801
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107801
@@ -1,3 +1,3 @@
-'3284',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,80700,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3288',3300,83700,,'',0,10700,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,80700,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107802 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107802
index fdca8c1a..d4e43306 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107802
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107802
@@ -1,3 +1,3 @@
-'3284',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,80800,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3288',3300,83800,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,80800,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107803 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107803
index a16e5e3e..60147322 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107803
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107803
@@ -1,3 +1,3 @@
-'3284',3300,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,80900,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3288',3300,83900,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,80900,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107804 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107804
index 55cfd57f..01cfb7c7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107804
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107804
@@ -1,3 +1,3 @@
-'3284',3300,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,80900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3288',3300,83900,,'',0,10700,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,80900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107805 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107805
index 72cd8349..d7e621ab 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107805
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107805
@@ -1,3 +1,3 @@
-'3284',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3288',3300,84000,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107806 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107806
index 21f62d05..49662d0c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107806
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107806
@@ -1,3 +1,3 @@
-'3284',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
'3288',3300,84100,,'',0,10600,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,4300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81100,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107807 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107807
index 86d22bd1..5b664265 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107807
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107807
@@ -1,3 +1,3 @@
-'3284',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
'3288',3300,84100,,'',0,10700,,'',0,11000,,'',0,7600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,4300,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81100,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,4000,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107817 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107817
index 41755a05..93e6d2dd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107817
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107817
@@ -1,3 +1,3 @@
-'3284',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3288',3900,92800,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
index 07e89a30..98a23844 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
@@ -1,3 +1,3 @@
-'3284',3401,55100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82400,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
index 612e1a3c..5d0ac0df 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
@@ -1,3 +1,3 @@
-'3284',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107823 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107823
index 8fbfc003..e67a34f8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107823
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107823
@@ -1,3 +1,3 @@
-'3284',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107824 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107824
index 55b1ecd9..65d18fdf 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107824
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107824
@@ -1,3 +1,3 @@
-'3284',3401,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9800,,'',0,10000,,'',0
-'3287',3401,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3288',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9800,,'',0,10000,,'',0
+'3489',3401,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107825 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107825
index 7a048a4c..93ab37df 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107825
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107825
@@ -1,3 +1,3 @@
-'3284',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107826 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107826
index 8fb0720b..23d0ff34 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107826
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107826
@@ -1,3 +1,3 @@
-'3284',3401,55400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75900,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,82700,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55400,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75900,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107827 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107827
index 39c968be..c452bad1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107827
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107827
@@ -1,3 +1,3 @@
-'3284',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,82800,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3486',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107828 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107828
index 94bcdbf0..6d8d6e27 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107828
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107828
@@ -1,3 +1,3 @@
-'3284',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,82800,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3401,55500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3401,80000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107829 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107829
index 67c21cd7..318ef68b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107829
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107829
@@ -1,3 +1,3 @@
-'3284',3401,55600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,80100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,82900,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3486',3401,55600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,80100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107830 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107830
index 782de585..97bca286 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107830
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107830
@@ -1,3 +1,3 @@
-'3284',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,83000,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3401,55700,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3401,80200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107831 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107831
index dfe003e4..dbb0b693 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107831
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107831
@@ -1,3 +1,3 @@
-'3284',3401,55800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3401,80300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,83100,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3401,55800,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3401,80300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107832 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107832
index f9ac9176..ce29bd28 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107832
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107832
@@ -1,3 +1,3 @@
-'3284',3401,55900,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3401,80400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,83200,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3401,55900,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3401,80400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107833 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107833
index d4ef05ef..a087dd4a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107833
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107833
@@ -1,3 +1,3 @@
-'3284',3401,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3401,83300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18500,,'',0
+'3486',3401,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107835 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107835
index fa8a6547..4211d836 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107835
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107835
@@ -1,3 +1,3 @@
-'3284',3400,60100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,80600,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3400,83400,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,80600,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107836 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107836
index c31e4274..6636d277 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107836
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107836
@@ -1,3 +1,3 @@
-'3284',3400,60200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,80700,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
'3288',3400,83500,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,80700,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107838 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107838
index b9c08052..603acb2c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107838
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107838
@@ -1,3 +1,3 @@
-'3284',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83600,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107839 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107839
index c0af4622..7f6a5198 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107839
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107839
@@ -1,3 +1,3 @@
-'3284',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83700,,'',0,17700,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60400,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3600,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,80900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107840 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107840
index 5b50ff39..3f7fe042 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107840
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107840
@@ -1,3 +1,3 @@
-'3284',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83700,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107841 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107841
index 18e64801..7373a4b3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107841
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107841
@@ -1,3 +1,3 @@
-'3284',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83700,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60500,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,81000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107842 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107842
index d1983367..53b8a179 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107842
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107842
@@ -1,3 +1,3 @@
-'3284',3400,60600,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,81100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83800,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60600,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,81100,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107843 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107843
index c6ddac2b..c5616265 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107843
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107843
@@ -1,3 +1,3 @@
-'3284',3400,60700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3287',3400,81200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83900,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3489',3400,81200,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
index 914305d9..4f4fa13c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
@@ -1,3 +1,3 @@
-'3284',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3287',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83900,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3489',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107845 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107845
index 4ca6afd3..ec37cb53 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107845
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107845
@@ -1,3 +1,3 @@
-'3284',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3287',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,84000,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3489',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107846 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107846
index 72c0fd58..b51ed699 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107846
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107846
@@ -1,3 +1,3 @@
-'3284',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
-'3287',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,84000,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3489',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107847 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107847
index c190a007..67967fa2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107847
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107847
@@ -1,3 +1,3 @@
-'3284',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
-'3287',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,84200,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
+'3489',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107849 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107849
index 2550e065..bfaaaf77 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107849
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107849
@@ -1,3 +1,3 @@
-'3284',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,92300,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107850 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107850
index 65029593..46b9c768 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107850
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107850
@@ -1,3 +1,3 @@
-'3284',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,91800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107851 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107851
index 44632364..17c88902 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107851
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107851
@@ -1,3 +1,3 @@
-'3284',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,91900,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107855 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107855
index 352b729a..73c613e3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107855
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107855
@@ -1,6 +1,6 @@
-'3284',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3284',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
-'3287',3500,83000,,'',0,67200,,'',0,22000,,'',0
-'3287',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
'3288',3500,94700,,'',0,25500,,'',0,63400,,'',0
'3288',3501,94700,4,'',0,25500,4,'',0,63400,4,'',0
+'3486',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3486',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
+'3489',3500,83000,,'',0,67200,,'',0,22000,,'',0
+'3489',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107856 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107856
index 76b0763d..e2af3635 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107856
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107856
@@ -1,3 +1,3 @@
-'3284',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3287',3500,83400,,'',0,67200,,'',0,22000,,'',0
'3288',3500,95100,,'',0,25500,,'',0,63400,,'',0
+'3486',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3489',3500,83400,,'',0,67200,,'',0,22000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107857 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107857
index 840257f9..7ed05121 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107857
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107857
@@ -1,3 +1,3 @@
-'3284',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3287',3500,83600,,'',0,67200,,'',0,22000,,'',0
'3288',3500,95300,,'',0,25500,,'',0,63400,,'',0
+'3486',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3489',3500,83600,,'',0,67200,,'',0,22000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107861 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107861
index efb2df6f..6aeff888 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107861
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107861
@@ -1,3 +1,3 @@
-'3284',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3288',3900,93000,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107870 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107870
index e9e0d469..3f836d04 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107870
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107870
@@ -1,8 +1,8 @@
-'3284',3200,60700,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10500,,'',0
-'3285',3200,63800,,'',0
-'3287',3200,81200,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81300,,'',0,10400,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63800,,'',0
-'3284',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3486',3200,60700,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10500,,'',0
+'3487',3200,63800,,'',0
+'3489',3200,81200,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,4500,,'',0,6900,,'',0,3000,,'',0,17000,,'',0
'3288',3900,90800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107871 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107871
index 26ec75fd..f07a328f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107871
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107871
@@ -1,8 +1,8 @@
-'3284',3200,60800,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
-'3285',3200,63900,,'',0
-'3287',3200,81300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8500,,'',0,2900,,'',0,3000,,'',0,17000,,'',0
'3288',3200,81400,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11500,,'',0
'3289',3200,63900,,'',0
-'3284',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3486',3200,60800,,'',0,10100,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,7100,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
+'3487',3200,63900,,'',0
+'3489',3200,81300,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8500,,'',0,2900,,'',0,3000,,'',0,17000,,'',0
'3288',3900,90800,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107877 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107877
index e9cdac1e..b43dfb64 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107877
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107877
@@ -1,3 +1,3 @@
-'3284',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
'3288',3900,92900,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107880 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107880
index 9be5416b..7fcb8fe5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107880
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107880
@@ -1,8 +1,8 @@
-'3284',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62700,,'',0
-'3287',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3201,80100,,'',0,10300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11500,,'',0
'3289',3201,62700,,'',0
-'3284',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3486',3201,55600,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62700,,'',0
+'3489',3201,80100,,'',0,3100,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,91400,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107883 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107883
index 9c9e4aae..b0da6533 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107883
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107883
@@ -1,6 +1,6 @@
-'3284',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3287',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3301,82800,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3284',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
-'3287',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
+'3486',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3489',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3400,84100,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,61000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,9700,,'',0,5900,,'',0
+'3489',3400,81500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
index faf589a5..158f8fe1 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
@@ -1,3 +1,3 @@
-'3284',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_108262 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_108262
index e55b06d4..5642fe3b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_108262
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_108262
@@ -1,28 +1,28 @@
-'3284',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,62300,,'',0,3100,,'',0,8100,,'',0,8400,,'',0,8600,,'',0,4800,,'',0,9000,,'',0,7600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,8900,,'',0,8900,,'',0,9000,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
-'3284',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
-'3287',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',100,53500,,'',0,8700,,'',0,3100,,'',0,7200,,'',0,2200,,'',0,5700,,'',0,1500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,2100,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,6700,,'',0,2300,,'',0,1900,,'',0,5900,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,6800,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,62300,,'',0,3000,,'',0,8200,,'',0,8500,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7200,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',200,63700,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',300,55100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,62100,,'',0
-'3287',300,55400,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
+'3486',200,55600,,'',0,6100,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,6900,,'',0
+'3489',200,62000,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3100,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3700,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',300,63500,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,8900,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,9500,,'',0,9100,,'',0,10100,,'',0,10100,,'',0
'3289',300,62100,,'',0
-'3287',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
+'3486',300,55100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7800,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7000,,'',0,4600,,'',0,8400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,62100,,'',0
+'3489',300,55400,,'',0,10000,,'',0,9900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',401,64500,,'',0,20000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17000,,'',0
-'3284',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60200,,'',0
-'3287',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
+'3489',401,60000,,'',0,5000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0
'3288',501,61700,,'',0,9800,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,4800,,'',0,8900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60200,,'',0
-'3287',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',501,63000,,'',0,2900,,'',0,6700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60200,,'',0
+'3489',501,63600,,'',0,9700,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,9600,,'',0,9500,,'',0,9200,,'',0
'3288',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3287',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3489',700,70000,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',900,63000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',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
-'3284',2601,141500,,'',0
-'3285',2601,72500,,'',0
+'3489',900,64000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,15000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',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
'3289',2601,72500,,'',0
-'3287',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',2601,141500,,'',0
+'3487',2601,72500,,'',0
'3288',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60000,,'',0,15500,,'',0,24500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120002
index dbae9f2d..dfb6893e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120002
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120002
@@ -1,12 +1,12 @@
-'3284',100,51900,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3284',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,3100,4,'',0,5800,4,'',0,2100,4,'',0,1900,4,'',0,5800,4,'',0,1700,4,'',0,1800,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6200,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1300,4,'',0,700,4,'',0,2600,4,'',0,6300,4,'',0,1800,4,'',0,2000,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,3000,4,'',0,6500,4,'',0,2600,4,'',0,7200,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,2500,4,'',0
-'3287',100,60600,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
-'3287',101,63400,4,'',0,8100,4,'',0,8500,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3500,4,'',0,6300,4,'',0,3300,4,'',0,7600,4,'',0,2400,4,'',0,6300,4,'',0,3500,4,'',0,6900,4,'',0,4900,4,'',0
'3288',100,60800,,'',0,3000,,'',0,8100,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,3600,,'',0,10000,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,15900,,'',0
'3288',101,63600,4,'',0,8100,4,'',0,4200,4,'',0,8600,4,'',0,8600,4,'',0,8800,4,'',0,3500,4,'',0,10100,4,'',0,9300,4,'',0,9000,4,'',0,9000,4,'',0,8900,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9700,4,'',0,6600,4,'',0,9300,4,'',0
-'3284',200,53600,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3284',201,55400,4,'',0,7000,4,'',0,3100,4,'',0,6700,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,1800,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1800,4,'',0,1900,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,2600,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,2900,4,'',0
-'3287',200,60000,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
-'3287',201,64300,4,'',0,7500,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3500,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7200,4,'',0,7600,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,7300,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,6800,4,'',0,3000,4,'',0,7500,4,'',0,2900,4,'',0,6400,4,'',0,3400,4,'',0,7000,4,'',0,4900,4,'',0
+'3486',100,51900,,'',0,8500,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,1400,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3486',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,3100,4,'',0,5800,4,'',0,2100,4,'',0,1900,4,'',0,5800,4,'',0,1700,4,'',0,1800,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6200,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2300,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1300,4,'',0,700,4,'',0,2600,4,'',0,6300,4,'',0,1800,4,'',0,2000,4,'',0,5800,4,'',0,2400,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,3000,4,'',0,6500,4,'',0,2600,4,'',0,7200,4,'',0,2700,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,2500,4,'',0
+'3489',100,60600,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
+'3489',101,63400,4,'',0,8100,4,'',0,8500,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3500,4,'',0,6300,4,'',0,3300,4,'',0,7600,4,'',0,2400,4,'',0,6300,4,'',0,3500,4,'',0,6900,4,'',0,4900,4,'',0
'3288',200,61700,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,5000,,'',0
'3288',201,65800,4,'',0,8000,4,'',0,8600,4,'',0,8600,4,'',0,4500,4,'',0,8600,4,'',0,9300,4,'',0,8700,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9600,4,'',0,8700,4,'',0,9500,4,'',0,8200,4,'',0,8900,4,'',0,4400,4,'',0,8500,4,'',0
+'3486',200,53600,,'',0,2000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3486',201,55400,4,'',0,7000,4,'',0,3100,4,'',0,6700,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,1800,4,'',0,2500,4,'',0,6300,4,'',0,2600,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6600,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1800,4,'',0,1900,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,2600,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,2900,4,'',0
+'3489',200,60000,,'',0,4500,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3400,,'',0,7000,,'',0
+'3489',201,64300,4,'',0,7500,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3500,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7200,4,'',0,7600,4,'',0,3600,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,7300,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,6800,4,'',0,3000,4,'',0,7500,4,'',0,2900,4,'',0,6400,4,'',0,3400,4,'',0,7000,4,'',0,4900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120006
index 32195446..571e1777 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120006
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120006
@@ -1,5 +1,5 @@
-'3284',1501,62100,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
-'3284',2600,145000,0,'Montrose Exch Only',0
-'3285',2600,80700,,'',0
+'3486',1501,62100,,'',0,8500,,'',0,11600,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'3289',2600,80700,,'',0
+'3486',2600,145000,0,'Montrose Exch Only',0
+'3487',2600,80700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
index a61c0ce6..a2a8789e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
@@ -1,16 +1,16 @@
-'3284',3101,62400,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
-'3287',3101,75900,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3288',3101,100600,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3284',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
-'3285',3201,62400,,'',0
-'3287',3201,75800,,'',0,7100,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3486',3101,62400,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
+'3489',3101,75900,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
'3288',3201,75800,,'',0,14300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3289',3201,62400,,'',0
-'3284',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3287',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3486',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3487',3201,62400,,'',0
+'3489',3201,75800,,'',0,7100,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3288',3900,90200,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,14000,,'',0
-'3284',1003101,72300,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,65300,,'',0
-'3287',1003101,82800,,'',0,10600,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,9900,,'',0
+'3486',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'3489',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3288',1003101,90100,,'',0,21300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,10000,,'',0
'3289',1003101,65300,,'',0
+'3486',1003101,72300,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,65300,,'',0
+'3489',1003101,82800,,'',0,10600,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120011
index 0cc8c2fb..fea49461 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120011
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120011
@@ -1 +1 @@
-'3284',1601,80400,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
+'3486',1601,80400,,'',0,12200,,'',0,68300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120012
index 2ad22bf2..eff4b83d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120012
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120012
@@ -1,3 +1,3 @@
-'3284',2201,150800,,'',0
-'3285',2201,81700,,'',0
'3289',2201,84700,,'',0
+'3486',2201,150800,,'',0
+'3487',2201,81700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120013
index 807c6d93..250b28c8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120013
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120013
@@ -1,6 +1,6 @@
-'3284',3100,73400,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7600,,'',0
-'3287',3100,91400,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3288',3100,112900,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10400,,'',0
-'3284',24003100,63500,,'',0,7000,,'',0
-'3285',24003100,60600,,'',0
+'3486',3100,73400,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,3700,,'',0,5700,,'',0,3500,,'',0,6700,,'',0,900,,'',0,7600,,'',0
+'3489',3100,91400,,'',0,10000,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
'3289',24003100,60600,,'',0
+'3486',24003100,63500,,'',0,7000,,'',0
+'3487',24003100,60600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120014
index 3bf91057..3030b8cc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120014
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120014
@@ -1,8 +1,8 @@
-'3284',3101,63300,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,2700,,'',0,7100,,'',0,1700,,'',0,38400,,'',0
-'3287',3101,80700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',3101,101600,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3284',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
-'3285',1003101,70300,,'',0
-'3287',1003101,83900,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
+'3486',3101,63300,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11800,,'',0,7900,,'',0,3400,,'',0,7700,,'',0,2700,,'',0,7100,,'',0,1700,,'',0,38400,,'',0
+'3489',3101,80700,,'',0,10300,,'',0,10600,,'',0,10900,,'',0,11100,,'',0,10900,,'',0,15500,,'',0,11500,,'',0,10900,,'',0,10900,,'',0
'3288',1003101,91200,,'',0,21400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,11500,,'',0,15000,,'',0,10900,,'',0,11500,,'',0,10000,,'',0
'3289',1003101,70300,,'',0
+'3486',1003101,73300,,'',0,7000,,'',0,3600,,'',0,7300,,'',0,10400,,'',0,10900,,'',0,11100,,'',0,11000,,'',0,15600,,'',0,5400,,'',0,7800,,'',0,7600,,'',0,3100,,'',0,6300,,'',0,10700,,'',0,4500,,'',0,16200,,'',0
+'3487',1003101,70300,,'',0
+'3489',1003101,83900,,'',0,10600,,'',0,10500,,'',0,15100,,'',0,11100,,'',0,10900,,'',0,11500,,'',0,11500,,'',0,14900,,'',0,11000,,'',0,11500,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120016
index d6c079f5..92389f2d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120016
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120016
@@ -1,5 +1,5 @@
-'3284',1500,64200,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
-'3287',1500,92700,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'3284',2601,143200,,'',0
-'3285',2601,75100,,'',0
+'3486',1500,64200,,'',0,8500,,'',0,12000,,'',0,68300,,'',0,20600,,'',0,8800,,'',0
+'3489',1500,92700,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
'3289',2601,75100,,'',0
+'3486',2601,143200,,'',0
+'3487',2601,75100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120017
index ec26d5fd..edfa4b76 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120017
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120017
@@ -1 +1 @@
-'3284',2600,145300,0,'Montrose Exch Only',0
+'3486',2600,145300,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120018
index cabf615c..1ef565fe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120018
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120018
@@ -1 +1 @@
-'3284',2400,142300,0,'Ctr Loop',0
+'3486',2400,142300,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120022
index 7d64dd0a..ec04bded 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120022
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120022
@@ -1,6 +1,6 @@
-'3284',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
-'3287',701,73200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',701,63100,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000701,63200,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,64700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24200,0,'Montrose Exch',0,15700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26800,0,'Montrose Exch',0
+'3489',701,73200,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73300,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,3000,0,'Montrose Exch',0,16900,0,'Montrose Exch',0,15800,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000701,63200,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120023
index 45f9d791..c85a1c5b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120023
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120023
@@ -1,11 +1,11 @@
-'3284',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
-'3287',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,63000,,'',0,8300,,'',0,4100,,'',0,8700,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,5400,,'',0,8800,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8800,,'',0,9000,,'',0
-'3284',301,60600,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72900,,'',0
-'3287',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
+'3486',200,54900,,'',0,6100,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2800,,'',0,7000,,'',0
+'3489',200,61300,,'',0,4500,,'',0,7500,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7700,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',301,63600,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72900,,'',0
-'3284',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
-'3287',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
+'3486',301,60600,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3900,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72900,,'',0
+'3489',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9500,,'',0,4800,,'',0,9500,,'',0,15500,,'',0,11800,,'',0
+'3486',601,61300,,'',0,4300,,'',0,7600,,'',0,7700,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,11500,,'',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
+'3489',601,62100,,'',0,12200,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,15000,,'',0,10200,,'',0,10500,,'',0,9900,,'',0,10000,,'',0,9500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120024
index b707be38..f8e12a1d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120024
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120024
@@ -1,4 +1,4 @@
-'3284',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,60800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',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
+'3486',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,7000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2500,,'',0,6300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,60800,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
+'3486',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/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120026
index 5902debd..826da8fc 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120026
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120026
@@ -1,2 +1,2 @@
-'3284',1501,62600,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
-'3287',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62600,,'',0,8500,,'',0,11700,,'',0,68500,,'',0,20500,,'',0,8900,,'',0
+'3489',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120027
index fb5bc412..cde9f6db 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120027
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120027
@@ -1,2 +1,2 @@
-'3284',1501,62500,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',1501,62500,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120028 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120028
index 27ea7fb8..d5e175ba 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120028
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120028
@@ -1,2 +1,2 @@
-'3284',1500,63700,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
-'3287',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3486',1500,63700,,'',0,8500,,'',0,11800,,'',0,68400,,'',0,20600,,'',0,8900,,'',0
+'3489',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120031
index 2f5b8783..d0c725ca 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120031
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120031
@@ -1,3 +1,3 @@
-'3284',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3287',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
'3288',3900,85000,,'',0,15500,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
+'3486',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'3489',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120032 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120032
index 37ab1332..233c33b4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120032
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120032
@@ -1 +1 @@
-'3284',2401,81000,0,'Ctr Loop',0
+'3486',2401,81000,0,'Ctr Loop',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120033
index 42e413b8..e08036f6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120033
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120033
@@ -1,3 +1,3 @@
-'3284',201,54900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
'3288',201,65400,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54900,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63900,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120034
index 5776aa55..2e0e8f4f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120034
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120034
@@ -1,3 +1,3 @@
-'3284',201,55000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,64000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
'3288',201,65500,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,55000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,64000,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120035
index dbb1f9c5..0b992da6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120035
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120035
@@ -1,3 +1,3 @@
-'3284',201,55200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,64100,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,4900,,'',0
'3288',201,65600,,'',0,8000,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'3486',201,55200,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,64100,,'',0,7500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120037
index cbfaf519..fe6f39c0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120037
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120037
@@ -1,3 +1,3 @@
-'3284',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64900,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54400,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63400,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120038
index 39278886..720f10f3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120038
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120038
@@ -1,3 +1,3 @@
-'3284',200,54300,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62400,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8100,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54300,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120039
index 37fa4a3c..2e9a6580 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120039
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120039
@@ -1,3 +1,3 @@
-'3284',200,54300,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62400,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54300,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,60700,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120040
index 985c7da1..525218f9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120040
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120040
@@ -1,3 +1,3 @@
-'3284',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62500,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54400,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,60800,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120041
index a3cdc1ab..9e0d2b9c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120041
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120041
@@ -1,3 +1,3 @@
-'3284',201,54100,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63100,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
'3288',201,64600,,'',0,8000,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8400,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54100,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2400,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1700,,'',0,5800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63100,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,7500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7000,,'',0,3600,,'',0,7600,,'',0,3200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2500,,'',0,7400,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120042
index 534ea7ef..0b2c8ffe 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120042
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120042
@@ -1,3 +1,3 @@
-'3284',200,54200,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62300,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54200,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120043
index 46476d39..d5f3fa46 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120043
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120043
@@ -1,6 +1,6 @@
-'3284',200,60900,4,'',0,2100,4,'',0,7100,4,'',0,3400,4,'',0,7000,4,'',0,2100,4,'',0,2000,4,'',0,5800,4,'',0,1800,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,5800,4,'',0,2500,4,'',0,2300,4,'',0,6700,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,3100,4,'',0,7100,4,'',0,2400,4,'',0,5800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6500,4,'',0,3200,4,'',0,6800,4,'',0,2800,4,'',0
-'3284',201,51500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',200,63200,4,'',0,8500,4,'',0,3500,4,'',0,6900,4,'',0,3200,4,'',0,7100,4,'',0,2700,4,'',0,7600,4,'',0,3200,4,'',0,7200,4,'',0,7300,4,'',0,3400,4,'',0,7200,4,'',0,3600,4,'',0,7600,4,'',0,3100,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7400,4,'',0,2700,4,'',0,6900,4,'',0,3600,4,'',0,6600,4,'',0,2400,4,'',0,7300,4,'',0,2900,4,'',0
-'3287',201,60500,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',200,64900,4,'',0,8300,4,'',0,8100,4,'',0,8800,4,'',0,4700,4,'',0,8700,4,'',0,8700,4,'',0,9400,4,'',0,8900,4,'',0,5300,4,'',0,9100,4,'',0,9100,4,'',0,9500,4,'',0,8400,4,'',0,9500,4,'',0,4000,4,'',0,8800,4,'',0,9000,4,'',0
'3288',201,62000,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,8500,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3486',200,60900,4,'',0,2100,4,'',0,7100,4,'',0,3400,4,'',0,7000,4,'',0,2100,4,'',0,2000,4,'',0,5800,4,'',0,1800,4,'',0,2100,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,5800,4,'',0,2500,4,'',0,2300,4,'',0,6700,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,3100,4,'',0,7100,4,'',0,2400,4,'',0,5800,4,'',0,1800,4,'',0,1900,4,'',0,5700,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1800,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6500,4,'',0,3200,4,'',0,6800,4,'',0,2800,4,'',0
+'3486',201,51500,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,1700,,'',0,5600,,'',0,1700,,'',0,1900,,'',0,6500,,'',0,2200,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,2300,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1200,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6200,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6500,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7200,,'',0,2800,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',200,63200,4,'',0,8500,4,'',0,3500,4,'',0,6900,4,'',0,3200,4,'',0,7100,4,'',0,2700,4,'',0,7600,4,'',0,3200,4,'',0,7200,4,'',0,7300,4,'',0,3400,4,'',0,7200,4,'',0,3600,4,'',0,7600,4,'',0,3100,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7400,4,'',0,2700,4,'',0,6900,4,'',0,3600,4,'',0,6600,4,'',0,2400,4,'',0,7300,4,'',0,2900,4,'',0
+'3489',201,60500,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120044
index fe083900..be0b3549 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120044
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120044
@@ -1,3 +1,3 @@
-'3284',201,54600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,63600,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
'3288',201,65100,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9200,,'',0,8700,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8300,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3486',201,54600,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,2300,,'',0,6600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,6600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,63600,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3600,,'',0,7600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,2800,,'',0,7000,,'',0,7500,,'',0,2900,,'',0,2400,,'',0,7400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120045
index 9de427a1..ffc86eb9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120045
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120045
@@ -1,3 +1,3 @@
-'3284',200,54200,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
-'3287',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62300,,'',0,8300,,'',0,4100,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9600,,'',0,4600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
+'3486',200,54200,,'',0,6100,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,2900,,'',0,7000,,'',0
+'3489',200,60600,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120046
index bd63b438..c77a5b6c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120046
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120046
@@ -1,6 +1,6 @@
-'3284',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,1300,,'',0,700,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,3000,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,63400,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3288',101,63600,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,3500,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,9400,,'',0
-'3284',201,55300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
-'3287',201,64300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
+'3486',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,1300,,'',0,700,,'',0,2600,,'',0,6300,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1800,,'',0,3000,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,63400,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,7000,,'',0,4900,,'',0
'3288',201,65800,,'',0,8000,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,8600,,'',0,9300,,'',0,8700,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9600,,'',0,8700,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'3486',201,55300,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2600,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0
+'3489',201,64300,,'',0,7500,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,2900,,'',0,6400,,'',0,3400,,'',0,7000,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120047
index 4143ba00..35046ac7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120047
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120047
@@ -1,3 +1,3 @@
-'3284',100,52500,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'3287',100,61300,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
'3288',100,61400,,'',0,3000,,'',0,8100,,'',0,8300,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,7600,,'',0,10000,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9700,,'',0,15900,,'',0
+'3486',100,52500,,'',0,8600,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,1700,,'',0,5500,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2100,,'',0,2200,,'',0,5800,,'',0,2000,,'',0,2700,,'',0,6300,,'',0,1900,,'',0,6000,,'',0,1700,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,1700,,'',0,7000,,'',0,2500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3489',100,61300,,'',0,3000,,'',0,8100,,'',0,8500,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,6300,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120048
index 6722e7fd..65f03a59 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120048
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120048
@@ -1,3 +1,3 @@
-'3284',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
-'3287',101,63100,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0,4900,,'',0
'3288',101,63300,,'',0,8100,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8800,,'',0,3500,,'',0,10100,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9700,,'',0,6600,,'',0,5300,,'',0
+'3486',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,3100,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6200,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,5300,,'',0,700,,'',0,2600,,'',0,6200,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,3100,,'',0,6500,,'',0,2600,,'',0,7200,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2500,,'',0
+'3489',101,63100,,'',0,8100,,'',0,4500,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3400,,'',0,6500,,'',0,3300,,'',0,7600,,'',0,2400,,'',0,6300,,'',0,3500,,'',0,6900,,'',0,4900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120049
index fe558ca0..ee3d2e55 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120049
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120049
@@ -1,6 +1,6 @@
-'3284',200,54100,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
-'3287',200,60500,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3288',200,62200,,'',0,8300,,'',0,4000,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4600,,'',0,9300,,'',0,8700,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,5600,,'',0,8600,,'',0,9500,,'',0,8200,,'',0,8900,,'',0,9000,,'',0
-'3284',2201,150700,,'',0
-'3285',2201,81700,,'',0
+'3486',200,54100,,'',0,6000,,'',0,3000,,'',0,7200,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2500,,'',0,6300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0
+'3489',200,60500,,'',0,4500,,'',0,7500,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3200,,'',0,7600,,'',0,3600,,'',0,7200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,6800,,'',0,3000,,'',0,7800,,'',0,2600,,'',0,6400,,'',0,3300,,'',0,7000,,'',0
'3289',2201,84700,,'',0
+'3486',2201,150700,,'',0
+'3487',2201,81700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120050
index 45863ade..d6c3f9d0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120050
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120050
@@ -1,6 +1,6 @@
-'3284',3300,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3284',3301,60100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7100,4,'',0,3200,4,'',0,7000,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,8300,4,'',0,7300,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,4400,4,'',0,6700,4,'',0,3000,4,'',0,6500,4,'',0
-'3287',3300,80600,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
-'3287',3301,80600,4,'',0,3000,4,'',0,7300,4,'',0,3200,4,'',0,7100,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11900,4,'',0,10000,4,'',0
'3288',3300,83600,,'',0,10600,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,12000,,'',0,10000,,'',0
'3288',3301,83600,4,'',0,10600,4,'',0,11000,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,10900,4,'',0,12000,4,'',0,10000,4,'',0
+'3486',3300,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,8300,,'',0,7300,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,4400,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
+'3486',3301,60100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7100,4,'',0,3200,4,'',0,7000,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,8300,4,'',0,7300,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,4400,4,'',0,6700,4,'',0,3000,4,'',0,6500,4,'',0
+'3489',3300,80600,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11900,,'',0,10000,,'',0
+'3489',3301,80600,4,'',0,3000,4,'',0,7300,4,'',0,3200,4,'',0,7100,4,'',0,4000,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11900,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120055
index 7a048a4c..93ab37df 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120055
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120055
@@ -1,3 +1,3 @@
-'3284',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
-'3287',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3288',3401,82600,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3486',3401,55300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3489',3401,75800,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120056
index 08b35ecf..eda4cbcd 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120056
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120056
@@ -1,3 +1,3 @@
-'3284',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,91200,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120057
index b5abe989..dd379a7d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120057
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120057
@@ -1,3 +1,3 @@
-'3284',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,92600,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120058
index 909103b2..31c15914 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120058
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120058
@@ -1,3 +1,3 @@
-'3284',3400,60300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
-'3287',3400,80800,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3288',3400,83500,,'',0,17800,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
+'3486',3400,60300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4400,,'',0,9700,,'',0,9900,,'',0
+'3489',3400,80800,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120059
index c3f56def..cd90f96f 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120059
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120059
@@ -1,3 +1,3 @@
-'3284',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3287',3501,82900,,'',0,67200,,'',0,22000,,'',0
'3288',3501,94600,,'',0,25500,,'',0,63400,,'',0
+'3486',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3489',3501,82900,,'',0,67200,,'',0,22000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120061
index 42a153f6..9ae257fb 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120061
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120061
@@ -1,6 +1,6 @@
-'3284',1000700,75000,4,'',0,6500,4,'',0,13000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,7000,4,'',0,12900,4,'',0,19900,4,'',0,19800,4,'',0
-'3284',1000701,75000,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'3287',1000700,61900,4,'',0,19700,4,'',0,20500,4,'',0,20100,4,'',0,21000,4,'',0,21500,4,'',0,20400,4,'',0
-'3287',1000701,61900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
'3288',1000700,72000,4,'',0,19600,4,'',0,19500,4,'',0,20100,4,'',0,20000,4,'',0,20000,4,'',0
'3288',1000701,72000,,'',0,19600,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,75000,4,'',0,6500,4,'',0,13000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,7000,4,'',0,12900,4,'',0,19900,4,'',0,19800,4,'',0
+'3486',1000701,75000,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,7000,0,'Montrose Exch',0,12900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
+'3489',1000700,61900,4,'',0,19700,4,'',0,20500,4,'',0,20100,4,'',0,21000,4,'',0,21500,4,'',0,20400,4,'',0
+'3489',1000701,61900,,'',0,19700,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120062
index b8630912..09e275ec 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120062
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120062
@@ -1,3 +1,3 @@
-'3284',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3287',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
'3288',3900,85400,,'',0,15600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15400,,'',0,14000,,'',0
+'3486',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
+'3489',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120067
index 12491c93..d29661e8 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120067
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120067
@@ -1,3 +1,3 @@
-'3284',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
-'3287',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3288',3900,90600,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,18000,,'',0
+'3486',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
+'3489',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120068
index 6c8b950f..ef3c50c3 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120068
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120068
@@ -1,5 +1,5 @@
-'3284',500,61400,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
-'3285',500,73800,,'',0
-'3287',500,70400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
'3288',500,64300,,'',0,10200,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,5100,,'',0,8900,,'',0,9900,,'',0
'3289',500,73800,,'',0
+'3486',500,61400,,'',0,9300,,'',0,10600,,'',0,2900,,'',0,6900,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7600,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3200,,'',0,7300,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,8300,,'',0,4400,,'',0,9800,,'',0
+'3487',500,73800,,'',0
+'3489',500,70400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7600,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,5400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120069
index 479dcf13..f648ac2c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120069
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120069
@@ -1,5 +1,5 @@
-'3284',501,63600,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'3285',501,60800,,'',0
-'3287',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
'3288',501,62200,,'',0,9900,,'',0,9800,,'',0,9800,,'',0,9900,,'',0,8900,,'',0,4900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9600,,'',0,9700,,'',0,9100,,'',0,10100,,'',0,10200,,'',0
'3289',501,60800,,'',0
+'3486',501,63600,,'',0,7000,,'',0,2700,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8600,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
+'3487',501,60800,,'',0
+'3489',501,64100,,'',0,9800,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,9600,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120070
index 3a602b33..d6dc6d1e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120070
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120070
@@ -1,6 +1,6 @@
-'3284',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
-'3287',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,61100,,'',0,20000,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,61100,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
+'3486',700,62500,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,19900,,'',0,20000,,'',0,27000,,'',0
+'3489',700,71100,,'',0,14500,,'',0,25500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',1000700,71100,,'',0,19500,,'',0,19500,,'',0,20100,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,74000,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20100,,'',0,7000,,'',0,12900,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,61100,,'',0,19500,,'',0,20500,,'',0,20100,,'',0,21000,,'',0,21500,,'',0,20400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120071
index 30091190..d88acd41 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120071
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120071
@@ -1,6 +1,6 @@
-'3284',400,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3284',401,61100,4,'',0,10100,4,'',0,2500,4,'',0,6600,4,'',0,11400,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,2500,4,'',0,7500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,12400,4,'',0
-'3287',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
-'3287',401,61600,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,10500,4,'',0,9900,4,'',0
'3288',400,70100,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
'3288',401,70100,4,'',0,20100,4,'',0,13000,4,'',0,17100,4,'',0,13000,4,'',0,17100,4,'',0,13000,4,'',0,11900,4,'',0,17000,4,'',0
+'3486',400,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,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,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3486',401,61100,4,'',0,10100,4,'',0,2500,4,'',0,6600,4,'',0,11400,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,2500,4,'',0,7500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,12400,4,'',0
+'3489',400,61600,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
+'3489',401,61600,4,'',0,9000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,11000,4,'',0,10000,4,'',0,11000,4,'',0,10900,4,'',0,9900,4,'',0,10500,4,'',0,9900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120074 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120074
index 86add2ab..caaeb2ed 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120074
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120074
@@ -1,6 +1,6 @@
-'3284',400,61300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
-'3287',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3288',400,70300,,'',0,20100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,17100,,'',0,13000,,'',0,11900,,'',0,17000,,'',0
-'3284',2600,144200,0,'Montrose Exch Only',0
-'3285',2600,80100,,'',0
+'3486',400,61300,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,6600,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,7500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,12400,0,'Montrose Exch',0
+'3489',400,61800,,'',0,9000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10900,,'',0,9900,,'',0,10500,,'',0,9900,,'',0
'3289',2600,80100,,'',0
+'3486',2600,144200,0,'Montrose Exch Only',0
+'3487',2600,80100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120075 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120075
index 2a8b1384..be0640d2 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120075
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120075
@@ -1,5 +1,5 @@
-'3284',301,54600,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
-'3285',301,70800,,'',0
-'3287',301,63600,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
'3288',301,61600,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,5000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9000,,'',0,9900,,'',0,9400,0,'Montrose Exch Only',0
'3289',301,70800,,'',0
+'3486',301,54600,,'',0,9200,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3700,,'',0,7600,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8800,0,'Montrose Exch Only',0
+'3487',301,70800,,'',0
+'3489',301,63600,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120077
index e9fa428c..6a640b08 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120077
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120077
@@ -1,3 +1,3 @@
-'3284',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81300,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,5900,,'',0
'3288',3300,84300,,'',0,10700,,'',0,15000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,12000,,'',0,10000,,'',0
+'3486',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81300,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,5900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120078
index 75f82577..4f977be7 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120078
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120078
@@ -1,5 +1,5 @@
-'3284',301,60400,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
-'3285',301,72700,,'',0
-'3287',301,65500,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
'3288',301,63400,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,9200,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9000,,'',0,5500,,'',0,9100,,'',0,9000,,'',0,9900,,'',0
'3289',301,72700,,'',0
+'3486',301,60400,,'',0,5300,,'',0,14400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7600,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,6900,,'',0,4300,,'',0,8400,,'',0,9800,,'',0
+'3487',301,72700,,'',0
+'3489',301,65500,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3700,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9400,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120079
index 0f3a262a..c160f72e 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120079
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120079
@@ -1,6 +1,6 @@
-'3284',3400,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
-'3284',3401,60000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7000,4,'',0,3200,4,'',0,7100,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,7600,4,'',0,7900,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,4500,4,'',0,9700,4,'',0,9900,4,'',0
-'3287',3400,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
-'3287',3401,80500,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,15000,4,'',0,11400,4,'',0
'3288',3400,83300,,'',0,17700,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
'3288',3401,83300,4,'',0,17700,4,'',0,11100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
+'3486',3400,60000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3600,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,9900,,'',0
+'3486',3401,60000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3600,4,'',0,7000,4,'',0,3200,4,'',0,7100,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,7600,4,'',0,7900,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,4500,4,'',0,9700,4,'',0,9900,4,'',0
+'3489',3400,80500,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11400,,'',0
+'3489',3401,80500,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,4000,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,15000,4,'',0,11400,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120080 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120080
index 142e9fec..a9eb7592 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120080
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120080
@@ -1,3 +1,3 @@
-'3284',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,92000,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,15000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120081
index 31468f4e..749b02bf 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120081
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120081
@@ -1,3 +1,3 @@
-'3284',701,64200,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
-'3287',701,72700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
'3288',701,62600,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
+'3486',701,64200,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20200,0,'Montrose Exch',0,19700,0,'Montrose Exch',0,19800,0,'Montrose Exch',0,26900,0,'Montrose Exch',0
+'3489',701,72700,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,20900,,'',0,20000,,'',0,9800,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120082
index b5abe989..dd379a7d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120082
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120082
@@ -1,3 +1,3 @@
-'3284',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'3287',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
'3288',3900,92600,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3486',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
+'3489',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120083
index 665d981f..044e7ef9 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120083
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120083
@@ -1,10 +1,10 @@
-'3284',200,60300,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
-'3287',200,62600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
'3288',200,64300,,'',0,8300,,'',0,8100,,'',0,4800,,'',0,8700,,'',0,8600,,'',0,8700,,'',0,9400,,'',0,4900,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9500,,'',0,8500,,'',0,9500,,'',0,4000,,'',0,8800,,'',0,9000,,'',0
-'3284',400,62800,4,'',0,30800,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,6500,4,'',0,3500,4,'',0,10100,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
-'3284',901,71600,4,'',0,150600,4,'',0
-'3284',1500,65100,4,'',0,109500,4,'',0
-'3284',1601,80700,4,'',0,85200,4,'',0
-'3284',2601,142100,,'',0
-'3285',2601,73000,,'',0
+'3486',200,60300,,'',0,2100,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,6200,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6500,,'',0,2300,,'',0,6700,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7100,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6500,,'',0,3200,,'',0,6800,,'',0,2900,,'',0
+'3489',200,62600,,'',0,8500,,'',0,3500,,'',0,6800,,'',0,3200,,'',0,7100,,'',0,2700,,'',0,7600,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,7200,,'',0,3600,,'',0,7600,,'',0,3100,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2700,,'',0,6900,,'',0,3600,,'',0,6600,,'',0,2400,,'',0,7300,,'',0,3000,,'',0
+'3486',400,62800,4,'',0,30800,4,'',0,9900,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,6500,4,'',0,3500,4,'',0,10100,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
+'3486',901,71600,4,'',0,150600,4,'',0
+'3486',1500,65100,4,'',0,109500,4,'',0
+'3486',1601,80700,4,'',0,85200,4,'',0
'3289',2601,73000,,'',0
+'3486',2601,142100,,'',0
+'3487',2601,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120084
index f8aa6fef..8bc251ed 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120084
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120084
@@ -1,5 +1,5 @@
-'3284',301,55200,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8600,4,'',0
-'3285',301,71400,,'',0
-'3287',301,64200,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8200,4,'',0
'3288',301,62200,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,9100,,'',0,9000,,'',0,10100,,'',0,5000,,'',0,9000,,'',0,9500,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,9200,4,'',0
'3289',301,71400,,'',0
+'3486',301,55200,,'',0,9200,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,7700,,'',0,3600,,'',0,7400,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8400,,'',0,8400,,'',0,9900,,'',0,8600,4,'',0
+'3487',301,71400,,'',0
+'3489',301,64200,,'',0,10000,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,9500,,'',0,9500,,'',0,8200,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120085 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120085
index eb27a5ec..d956d938 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120085
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120085
@@ -1,9 +1,9 @@
-'3284',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
-'3287',101,61500,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',101,61900,,'',0,4000,,'',0,8100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,7500,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9700,,'',0,2800,,'',0,9400,,'',0
-'3284',701,65000,4,'',0,25100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,15800,4,'',0,26800,4,'',0
-'3287',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
+'3486',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,3000,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6500,,'',0,2300,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6600,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,3300,,'',0,2500,,'',0,6700,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6500,,'',0
+'3489',101,61500,,'',0,4000,,'',0,8500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,2500,,'',0,7400,,'',0,3600,,'',0,6400,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',701,63400,,'',0,20200,,'',0,19000,,'',0,20100,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,12500,,'',0
-'3284',1000701,80900,4,'',0,2400,4,'',0,17000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,3000,4,'',0,16900,4,'',0,19800,4,'',0,19800,4,'',0
-'3287',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
+'3486',701,65000,4,'',0,25100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20200,4,'',0,19700,4,'',0,15800,4,'',0,26800,4,'',0
+'3489',701,73500,,'',0,18600,,'',0,21500,,'',0,20600,,'',0,21500,,'',0,24900,,'',0,20000,,'',0,9800,,'',0,13000,,'',0
'3288',1000701,73600,,'',0,19700,,'',0,19500,,'',0,20100,,'',0,20100,,'',0,20000,,'',0
+'3486',1000701,80900,4,'',0,2400,4,'',0,17000,4,'',0,20100,4,'',0,20000,4,'',0,20100,4,'',0,3000,4,'',0,16900,4,'',0,19800,4,'',0,19800,4,'',0
+'3489',1000701,63500,,'',0,19800,,'',0,20500,,'',0,20100,,'',0,21100,,'',0,25500,,'',0,20300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120086 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120086
index 0ac01d69..4a396057 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120086
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120086
@@ -1,8 +1,8 @@
-'3284',401,60000,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
-'3287',401,60400,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',401,64900,,'',0,20100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17000,,'',0
-'3284',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
-'3287',900,64500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',401,60000,,'',0,10000,,'',0,2500,,'',0,2500,,'',0,15500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0
+'3489',401,60400,,'',0,5000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,9900,,'',0
'3288',900,63500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,13000,,'',0
-'3284',1501,61500,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
-'3287',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3486',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0
+'3489',900,64500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3486',1501,61500,,'',0,8500,,'',0,11500,,'',0,68500,,'',0,20500,,'',0,5000,,'',0
+'3489',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120087
index 77a464a5..bd406f7c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120087
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120087
@@ -1,3 +1,3 @@
-'3284',100,54400,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,6200,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
-'3287',100,63200,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
'3288',100,63100,,'',0,7200,,'',0,4100,,'',0,8400,,'',0,8600,,'',0,8800,,'',0,5000,,'',0,7600,,'',0,10100,,'',0,9300,,'',0,9000,,'',0,9000,,'',0,4900,,'',0,8900,,'',0,8900,,'',0,8800,,'',0,9500,,'',0,11900,,'',0
+'3486',100,54400,,'',0,8700,,'',0,7100,,'',0,3300,,'',0,2200,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1800,,'',0,2100,,'',0,5100,,'',0,1100,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6300,,'',0,1900,,'',0,600,,'',0,6500,,'',0,2700,,'',0,6200,,'',0,2200,,'',0,1800,,'',0,6000,,'',0,2700,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6300,,'',0,1900,,'',0,2000,,'',0,5700,,'',0,2700,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6700,,'',0,2900,,'',0,7000,,'',0,2900,,'',0
+'3489',100,63200,,'',0,7000,,'',0,4200,,'',0,8500,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3100,,'',0,7700,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7400,,'',0,2200,,'',0,7100,,'',0,3500,,'',0,6500,,'',0,2300,,'',0,7500,,'',0,2800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120088
index 4870ccf0..11934674 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120088
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120088
@@ -1,5 +1,5 @@
-'3284',300,60200,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
-'3285',300,63300,,'',0
-'3287',300,60500,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
'3288',300,64500,,'',0,10000,,'',0,9900,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,5600,,'',0,9500,,'',0,9000,,'',0,10100,,'',0,10100,,'',0
'3289',300,63300,,'',0
+'3486',300,60200,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3600,,'',0,7000,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9400,,'',0
+'3487',300,63300,,'',0
+'3489',300,60500,,'',0,10000,,'',0,10000,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,9600,,'',0,9500,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120089 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120089
index 443430a4..0ca6a73c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120089
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120089
@@ -1,12 +1,12 @@
-'3284',201,52600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'3287',201,61600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',201,63100,,'',0,8000,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,4500,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9500,,'',0,8900,,'',0,5500,,'',0,8400,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'3284',400,73000,4,'',0,2500,4,'',0,6600,4,'',0,143600,4,'',0
-'3287',400,63200,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,5900,,'',0,14400,,'',0,9900,,'',0
+'3486',201,52600,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,5800,,'',0,1700,,'',0,1700,,'',0,5900,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6300,,'',0,2300,,'',0,2600,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1300,,'',0,1000,0,'Bourquin Exch Only',0,1400,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2400,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2300,,'',0,7100,,'',0,2800,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3489',201,61600,,'',0,3500,,'',0,6500,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2800,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,7500,,'',0,3000,,'',0,9000,,'',0
'3288',400,71700,,'',0,20100,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,12900,,'',0
-'3284',901,61400,4,'',0,20500,4,'',0,9800,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
-'3287',901,71300,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3486',400,73000,4,'',0,2500,4,'',0,6600,4,'',0,143600,4,'',0
+'3489',400,63200,,'',0,9000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10900,,'',0,10000,,'',0,11000,,'',0,14900,,'',0,5900,,'',0,14400,,'',0,9900,,'',0
'3288',901,70300,,'',0,13000,,'',0,17200,,'',0,13100,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,16900,,'',0
-'3284',2600,151100,4,'',0
-'3285',2600,81800,,'',0
+'3486',901,61400,4,'',0,20500,4,'',0,9800,4,'',0,9900,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'3489',901,71300,,'',0,9500,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,9900,,'',0,10500,,'',0,11000,,'',0,10000,,'',0,11000,,'',0,10500,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
'3289',2600,81800,,'',0
+'3486',2600,151100,4,'',0
+'3487',2600,81800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120090
index c89f2efd..34f4447b 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120090
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120090
@@ -1,10 +1,10 @@
-'3284',700,62000,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
-'3287',700,70600,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
'3288',700,60600,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'3284',1500,73500,4,'',0,12300,4,'',0,68100,4,'',0,29300,4,'',0
-'3287',1500,93500,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
-'3284',1600,73500,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
-'3284',1601,92800,4,'',0,68300,4,'',0
-'3284',1000700,73500,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
-'3287',1000700,60600,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
+'3486',700,62000,,'',0,21000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,27000,,'',0
+'3489',700,70600,,'',0,14500,,'',0,25500,,'',0,20500,,'',0,21500,,'',0,21000,,'',0,20000,,'',0,10000,,'',0,17000,,'',0
+'3486',1500,73500,4,'',0,12300,4,'',0,68100,4,'',0,29300,4,'',0
+'3489',1500,93500,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3486',1600,73500,,'',0,16500,,'',0,64000,,'',0,8500,,'',0
+'3486',1601,92800,4,'',0,68300,4,'',0
'3288',1000700,70600,,'',0,19500,,'',0,15500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3486',1000700,73500,,'',0,6500,,'',0,13000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,7000,,'',0,13000,,'',0,20000,,'',0,20000,,'',0
+'3489',1000700,60600,,'',0,19500,,'',0,20500,,'',0,20000,,'',0,21000,,'',0,21500,,'',0,20500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092
index 1f1458e3..1b2ebdd5 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092
@@ -1,26 +1,26 @@
-'3284',3100,74400,4,'',0,7100,4,'',0,3500,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,9900,4,'',0,7800,4,'',0,1700,4,'',0,7600,4,'',0,2700,4,'',0,800,4,'',0,7500,4,'',0
-'3287',3100,92400,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,11000,4,'',0
'3288',3100,113900,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,10300,4,'',0
-'3284',3200,61200,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,2700,4,'',0,9500,4,'',0,10400,4,'',0
-'3285',3200,64300,4,'',0
-'3287',3200,81700,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
+'3486',3100,74400,4,'',0,7100,4,'',0,3500,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,9900,4,'',0,7800,4,'',0,1700,4,'',0,7600,4,'',0,2700,4,'',0,800,4,'',0,7500,4,'',0
+'3489',3100,92400,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,11000,4,'',0
'3288',3200,81800,4,'',0,10400,4,'',0,10300,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,11000,4,'',0,11500,4,'',0
'3289',3200,64300,4,'',0
-'3284',3300,61200,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,6900,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7600,4,'',0,4300,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,2700,4,'',0,7000,4,'',0,2500,4,'',0
-'3284',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
-'3287',3300,81600,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,15900,4,'',0,9900,4,'',0
-'3287',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3486',3200,61200,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,2700,4,'',0,9500,4,'',0,10400,4,'',0
+'3487',3200,64300,4,'',0
+'3489',3200,81700,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
'3288',3300,84600,4,'',0,10700,4,'',0,15000,4,'',0,3600,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,10800,4,'',0,16000,4,'',0,10000,4,'',0
'3288',3301,82500,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3284',3400,61200,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
-'3284',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
-'3287',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
-'3287',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3486',3300,61200,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,6900,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7600,4,'',0,4300,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,2700,4,'',0,7000,4,'',0,2500,4,'',0
+'3486',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
+'3489',3300,81600,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,15900,4,'',0,9900,4,'',0
+'3489',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3288',3400,84300,4,'',0,17800,4,'',0,11100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
'3288',3401,82300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
-'3284',1003100,70100,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,8700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,3900,4,'',0,9400,4,'',0,7300,4,'',0,8000,4,'',0,4900,4,'',0,8100,4,'',0,12700,4,'',0,14300,4,'',0,10800,4,'',0
-'3287',1003100,85000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0,15600,4,'',0,10100,4,'',0,9800,4,'',0
+'3486',3400,61200,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
+'3486',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
+'3489',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
+'3489',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3288',1003100,85000,4,'',0,10500,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,14800,4,'',0,14300,4,'',0,16000,4,'',0,10400,4,'',0
-'3284',24003100,64300,4,'',0,7000,4,'',0
-'3285',24003100,61300,4,'',0
+'3486',1003100,70100,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,8700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,3900,4,'',0,9400,4,'',0,7300,4,'',0,8000,4,'',0,4900,4,'',0,8100,4,'',0,12700,4,'',0,14300,4,'',0,10800,4,'',0
+'3489',1003100,85000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0,15600,4,'',0,10100,4,'',0,9800,4,'',0
'3289',24003100,61300,4,'',0
+'3486',24003100,64300,4,'',0,7000,4,'',0
+'3487',24003100,61300,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093
index 1dadd88c..befda3af 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093
@@ -1,9 +1,9 @@
-'3284',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
-'3284',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3287',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
-'3287',3501,82500,,'',0,63100,,'',0,26000,,'',0
'3288',3500,100000,4,'',0,21500,4,'',0,63400,4,'',0
'3288',3501,94100,,'',0,21500,,'',0,67500,,'',0
-'3284',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
-'3287',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
+'3486',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
+'3486',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3489',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'3489',3501,82500,,'',0,63100,,'',0,26000,,'',0
'3288',3900,84600,,'',0,8800,4,'',0,6700,,'',0,4900,4,'',0,5600,,'',0,4900,4,'',0,6600,,'',0,8900,4,'',0,2100,,'',0,8900,4,'',0,2600,,'',0,8900,4,'',0,6600,,'',0,4800,4,'',0,9200,,'',0,8700,4,'',0
+'3486',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
+'3489',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
diff --git a/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
index a750d3b6..9ea64358 100644
--- a/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
+++ b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
49.1583
-122.47064
-122.21454
- 1728994500
+ 1729429200
1736060940
diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml
index 83c59e86..d5414b4a 100755
--- a/app-android/src/main/res/values/gtfs_rts_values.xml
+++ b/app-android/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
- 20240910
+ 20240924
org.mtransit.android.ca_central_fraser_valley_transit_system_bus.gtfs
@string/gtfs_rts_authority
https://www.bctransit.com/contact